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

Merge with master

Browse Source
This commit is contained in:
DizzyEggg 2019-01-05 10:14:20 +01:00
commit 4827776a3c
398 changed files with 27391 additions and 48899 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis/calcrom/calcrom.pl
View File

@ -7,6 +7,7 @@ open(my $file, $ARGV[0])
my $src = 0;
my $asm = 0;
my $undocumented = 0;
while (my $line = <$file>)
{
if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/)
@ -27,6 +28,13 @@ while (my $line = <$file>)
}
}
}
if($line =~ /^\s+0x([0-9A-f]+)\s+[A-z_]+([0-9A-f]+)/) {
my $thing1 = sprintf("%08X", hex($1));
my $thing2 = sprintf("%08X", hex($2));
if($thing1 eq $thing2) {
$undocumented += 1;
}
}
}
my $total = $src + $asm;
@ -35,3 +43,4 @@ my $asmPct = sprintf("%.4f", 100 * $asm / $total);
print "$total total bytes of code\n";
print "$src bytes of code in src ($srcPct%)\n";
print "$asm bytes of code in asm ($asmPct%)\n";
print "$undocumented global symbols undocumented\n";

5
Makefile
View File

@ -38,7 +38,7 @@ ASFLAGS := -mcpu=arm7tdmi
CC1 := tools/agbcc/bin/agbcc$(EXE)
override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include -nostdinc -undef
CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include
LDFLAGS = -Map ../../$(MAP)
@ -178,7 +178,7 @@ $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
$(RAMSCRGEN) ewram_data $< ENGLISH > $@
$(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld
cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld
cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../ld_script.txt > ld_script.ld
$(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)
@ -186,4 +186,3 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
$(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@
$(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent

1588
asm/battle_anim_effects_3.s
View File

File diff suppressed because it is too large Load Diff

2525
asm/battle_frontier_1.s
View File

File diff suppressed because it is too large Load Diff

3162
asm/contest_link_80F57C4.s
View File

File diff suppressed because it is too large Load Diff

1362
asm/contest_link_80FC4F4.s
View File

File diff suppressed because it is too large Load Diff

890
asm/contest_link_81D9DE4.s
View File

@ -1,890 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_81D9DE4
sub_81D9DE4: @ 81D9DE4
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
ldr r1, =gTasks
lsls r0, r6, 2
adds r0, r6
lsls r0, 3
adds r0, r1
movs r1, 0x1A
ldrsh r0, [r0, r1]
cmp r0, 0x4
bhi _081D9EA4
lsls r0, 2
ldr r1, =_081D9E10
adds r0, r1
ldr r0, [r0]
mov pc, r0
.pool
.align 2, 0
_081D9E10:
.4byte _081D9E24
.4byte _081D9E44
.4byte _081D9E64
.4byte _081D9E84
.4byte _081D9EA4
_081D9E24:
ldr r4, =gUnknown_02039F31
ldr r0, =gUnknown_02039F24
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x32
b _081D9EB4
.pool
_081D9E44:
ldr r4, =gUnknown_02039F31
ldr r0, =gUnknown_02039F24
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x33
b _081D9EB4
.pool
_081D9E64:
ldr r4, =gUnknown_02039F31
ldr r0, =gUnknown_02039F24
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x34
b _081D9EB4
.pool
_081D9E84:
ldr r4, =gUnknown_02039F31
ldr r0, =gUnknown_02039F24
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x35
b _081D9EB4
.pool
_081D9EA4:
ldr r4, =gUnknown_02039F31
ldr r0, =gUnknown_02039F24
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
ldr r1, =gPlayerParty
adds r0, r1
movs r1, 0x36
_081D9EB4:
bl GetMonData
strb r0, [r4]
ldr r5, =gContestMons
ldr r4, =gContestPlayerMonIndex
ldrb r0, [r4]
lsls r0, 6
adds r0, r5
ldr r1, =gUnknown_02039F31
ldrb r1, [r1]
adds r0, 0x2C
strb r1, [r0]
ldr r0, =0x00000864 @ = FLAG_SYS_GAME_CLEAR
bl FlagGet
lsls r0, 24
lsrs r0, 24
negs r0, r0
lsrs r0, 31
ldrb r1, [r4]
lsls r1, 6
adds r1, r5
adds r1, 0x2D
strb r0, [r1]
ldr r1, =sub_81DA160
ldr r2, =sub_81D9F14
adds r0, r6, 0
bl SetTaskFuncWithFollowupFunc
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D9DE4
thumb_func_start sub_81D9F14
sub_81D9F14: @ 81D9F14
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =sub_81DA244
ldr r2, =sub_81D9F30
bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.pool
thumb_func_end sub_81D9F14
thumb_func_start sub_81D9F30
sub_81D9F30: @ 81D9F30
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =sub_81DA2E8
ldr r2, =sub_81D9F4C
bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.pool
thumb_func_end sub_81D9F30
thumb_func_start sub_81D9F4C
sub_81D9F4C: @ 81D9F4C
push {lr}
lsls r0, 24
lsrs r0, 24
ldr r1, =sub_81DA3B8
ldr r2, =sub_81D9F68
bl SetTaskFuncWithFollowupFunc
pop {r0}
bx r0
.pool
thumb_func_end sub_81D9F4C
thumb_func_start sub_81D9F68
sub_81D9F68: @ 81D9F68
push {r4-r7,lr}
mov r7, r9
mov r6, r8
push {r6,r7}
sub sp, 0x8
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0
str r0, [sp]
str r0, [sp, 0x4]
movs r3, 0
ldr r5, =gUnknown_02039F30
mov r8, r5
ldr r0, =gSpecialVar_0x8004
mov r12, r0
add r1, sp, 0x4
mov r9, r1
ldrb r4, [r5]
cmp r3, r4
bcs _081D9FB2
lsls r0, r6, 2
adds r0, r6
lsls r4, r0, 3
ldr r7, =gTasks + 0x8
_081D9F98:
mov r0, sp
adds r2, r0, r3
adds r1, r3, 0x1
lsls r0, r1, 1
adds r0, r4
adds r0, r7
ldrh r0, [r0]
strb r0, [r2]
lsls r1, 24
lsrs r3, r1, 24
ldrb r1, [r5]
cmp r3, r1
bcc _081D9F98
_081D9FB2:
movs r3, 0
mov r4, r8
ldrb r0, [r4]
cmp r3, r0
bcs _081D9FD6
adds r4, r0, 0
mov r2, sp
_081D9FC0:
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, r4
bcs _081D9FD6
mov r7, sp
adds r1, r7, r3
ldrb r0, [r2]
ldrb r1, [r1]
cmp r0, r1
beq _081D9FC0
_081D9FD6:
mov r0, r8
ldrb r0, [r0]
cmp r3, r0
bne _081D9FF4
movs r0, 0
mov r1, r12
strh r0, [r1]
b _081D9FFA
.pool
_081D9FF4:
movs r0, 0x1
mov r4, r12
strh r0, [r4]
_081D9FFA:
movs r3, 0
mov r7, r8
mov r0, r8
ldrb r0, [r0]
cmp r3, r0
bcs _081DA02A
mov r4, r9
lsls r0, r6, 2
adds r0, r6
lsls r2, r0, 3
ldr r5, =gTasks + 0x8
_081DA010:
adds r1, r4, r3
adds r0, r3, 0x5
lsls r0, 1
adds r0, r2
adds r0, r5
ldrh r0, [r0]
strb r0, [r1]
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
ldrb r1, [r7]
cmp r3, r1
bcc _081DA010
_081DA02A:
mov r4, r8
ldrb r0, [r4]
cmp r0, 0x4
beq _081DA0B8
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _081DA0B8
ldr r0, =gContestMons
adds r1, r0, 0
adds r1, 0x2C
ldrb r2, [r1]
movs r3, 0x1
ldrb r1, [r4]
adds r5, r0, 0
cmp r3, r1
bcs _081DA06C
adds r4, r5, 0
mov r7, r8
ldrb r1, [r7]
_081DA054:
lsls r0, r3, 6
adds r0, r4
adds r0, 0x2C
ldrb r7, [r0]
cmp r2, r7
bcs _081DA062
ldrb r2, [r0]
_081DA062:
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
cmp r3, r1
bcc _081DA054
_081DA06C:
cmp r2, 0
beq _081DA076
subs r0, r2, 0x1
lsls r0, 24
lsrs r2, r0, 24
_081DA076:
movs r4, 0x1
movs r3, 0
mov r0, r8
ldrb r0, [r0]
cmp r3, r0
bcs _081DA0AC
adds r0, r5, 0
b _081DA0A2
.pool
_081DA090:
adds r0, r3, 0x1
lsls r0, 24
lsrs r3, r0, 24
mov r1, r8
ldrb r1, [r1]
cmp r3, r1
bcs _081DA0AC
lsls r0, r3, 6
adds r0, r5
_081DA0A2:
adds r0, 0x2D
ldrb r0, [r0]
cmp r0, 0
bne _081DA090
movs r4, 0
_081DA0AC:
mov r0, sp
ldrb r0, [r0]
adds r1, r2, 0
adds r2, r4, 0
bl sub_80DACBC
_081DA0B8:
mov r0, r9
bl sub_80F86E0
ldr r1, =gUnknown_02039F2B
strb r0, [r1]
ldr r0, =gUnknown_02039F30
ldrb r0, [r0]
cmp r0, 0x3
bhi _081DA0E8
ldr r1, =sub_81DA488
ldr r2, =sub_81DA10C
adds r0, r6, 0
bl SetTaskFuncWithFollowupFunc
b _081DA0F6
.pool
_081DA0E8:
ldr r0, =gTasks
lsls r1, r6, 2
adds r1, r6
lsls r1, 3
adds r1, r0
ldr r0, =sub_81DA10C
str r0, [r1]
_081DA0F6:
add sp, 0x8
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81D9F68
thumb_func_start sub_81DA10C
sub_81DA10C: @ 81DA10C
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
ldr r0, =gSpecialVar_ContestCategory
ldrb r0, [r0]
bl sub_80DB09C
ldr r1, =sub_80FCF40
ldr r2, =sub_81DA138
adds r0, r4, 0
bl SetTaskFuncWithFollowupFunc
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DA10C
thumb_func_start sub_81DA138
sub_81DA138: @ 81DA138
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
movs r0, 0
bl sub_80DCE58
ldr r1, =sub_80FCFD0
ldr r2, =sub_80F8714
adds r0, r4, 0
bl SetTaskFuncWithFollowupFunc
pop {r4}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DA138
thumb_func_start sub_81DA160
sub_81DA160: @ 81DA160
push {r4-r7,lr}
mov r7, r8
push {r7}
lsls r0, 24
lsrs r7, r0, 24
lsls r6, r7, 2
adds r0, r6, r7
lsls r4, r0, 3
ldr r5, =gTasks + 0x8
adds r0, r4, r5
adds r0, 0x18
bl sub_80FC670
cmp r0, 0
beq _081DA224
adds r0, r5, 0
subs r0, 0x8
adds r4, r0
movs r1, 0x8
ldrsh r0, [r4, r1]
cmp r0, 0
beq _081DA1A4
cmp r0, 0x1
beq _081DA1D4
movs r0, 0
strh r0, [r4, 0x8]
strh r0, [r4, 0x20]
adds r0, r7, 0
bl SwitchTaskToFollowupFunc
b _081DA224
.pool
_081DA1A4:
bl sub_800A520
lsls r0, 24
cmp r0, 0
beq _081DA224
ldr r0, =gContestPlayerMonIndex
ldrb r0, [r0]
lsls r0, 6
ldr r1, =gContestMons
adds r0, r1
movs r1, 0x40
bl sub_80FC4F4
cmp r0, 0x1
bne _081DA224
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
b _081DA224
.pool
_081DA1D4:
bl sub_80FC55C
lsls r0, 24
cmp r0, 0
beq _081DA224
movs r5, 0
ldr r0, =gUnknown_02039F30
mov r8, r6
ldrb r0, [r0]
cmp r5, r0
bge _081DA214
ldr r6, =gLinkPlayers
_081DA1EC:
lsls r4, r5, 6
ldr r0, =gContestMons
adds r4, r0
lsls r1, r5, 8
ldr r0, =gBlockRecvBuffer
adds r1, r0
adds r0, r4, 0
movs r2, 0x40
bl memcpy
ldrh r1, [r6, 0x1A]
adds r0, r4, 0
bl sub_80DFA08
adds r6, 0x1C
adds r5, 0x1
ldr r0, =gUnknown_02039F30
ldrb r0, [r0]
cmp r5, r0
blt _081DA1EC
_081DA214:
ldr r0, =gTasks
mov r2, r8
adds r1, r2, r7
lsls r1, 3
adds r1, r0
ldrh r0, [r1, 0x8]
adds r0, 0x1
strh r0, [r1, 0x8]
_081DA224:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DA160
thumb_func_start sub_81DA244
sub_81DA244: @ 81DA244
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
lsls r0, r4, 2
adds r0, r4
lsls r5, r0, 3
ldr r6, =gTasks + 0x8
adds r0, r5, r6
adds r0, 0x18
bl sub_80FC670
cmp r0, 0
beq _081DA2D4
adds r0, r6, 0
subs r0, 0x8
adds r5, r0
movs r1, 0x8
ldrsh r0, [r5, r1]
cmp r0, 0
beq _081DA284
cmp r0, 0x1
beq _081DA2AC
movs r0, 0
strh r0, [r5, 0x8]
strh r0, [r5, 0x20]
adds r0, r4, 0
bl SwitchTaskToFollowupFunc
b _081DA2D4
.pool
_081DA284:
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _081DA2CE
bl sub_800A520
lsls r0, 24
cmp r0, 0
beq _081DA2D4
ldr r0, =gRngValue
movs r1, 0x4
bl sub_80FC4F4
cmp r0, 0x1
bne _081DA2D4
b _081DA2CE
.pool
_081DA2AC:
movs r0, 0
bl sub_80FC530
lsls r0, 24
cmp r0, 0
beq _081DA2D4
ldr r0, =gRngValue
ldr r4, =gBlockRecvBuffer
adds r1, r4, 0
movs r2, 0x4
bl memcpy
ldr r0, =gContestRngValue
adds r1, r4, 0
movs r2, 0x4
bl memcpy
_081DA2CE:
ldrh r0, [r5, 0x8]
adds r0, 0x1
strh r0, [r5, 0x8]
_081DA2D4:
pop {r4-r6}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DA244
thumb_func_start sub_81DA2E8
sub_81DA2E8: @ 81DA2E8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0xC
lsls r0, 24
lsrs r6, r0, 24
lsls r0, r6, 2
mov r9, r0
adds r0, r6
lsls r5, r0, 3
ldr r1, =gTasks + 0x8
mov r8, r1
adds r0, r5, r1
adds r0, 0x18
bl sub_80FC670
cmp r0, 0
beq _081DA39E
movs r0, 0x8
negs r0, r0
add r0, r8
mov r10, r0
adds r4, r5, r0
movs r1, 0x8
ldrsh r0, [r4, r1]
cmp r0, 0
beq _081DA338
cmp r0, 0x1
beq _081DA35A
movs r0, 0
strh r0, [r4, 0x8]
strh r0, [r4, 0x20]
adds r0, r6, 0
bl SwitchTaskToFollowupFunc
b _081DA39E
.pool
_081DA338:
bl sub_800A520
lsls r0, 24
cmp r0, 0
beq _081DA39E
add r0, sp, 0x8
movs r1, 0x6E
strh r1, [r0]
movs r1, 0x2
bl sub_80FC4F4
cmp r0, 0x1
bne _081DA39E
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
b _081DA39E
_081DA35A:
bl sub_80FC55C
lsls r0, 24
cmp r0, 0
beq _081DA39E
movs r1, 0
ldr r7, =gUnknown_02039F30
ldrb r0, [r7]
cmp r1, r0
bge _081DA390
mov r0, r8
adds r0, 0xA
adds r3, r5, r0
ldr r4, =gBlockRecvBuffer
mov r2, sp
movs r5, 0x80
lsls r5, 1
_081DA37C:
ldrh r0, [r4]
strh r0, [r2]
strh r0, [r3]
adds r3, 0x2
adds r4, r5
adds r2, 0x2
adds r1, 0x1
ldrb r0, [r7]
cmp r1, r0
blt _081DA37C
_081DA390:
mov r0, r9
adds r1, r0, r6
lsls r1, 3
add r1, r10
ldrh r0, [r1, 0x8]
adds r0, 0x1
strh r0, [r1, 0x8]
_081DA39E:
add sp, 0xC
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DA2E8
thumb_func_start sub_81DA3B8
sub_81DA3B8: @ 81DA3B8
push {r4-r7,lr}
mov r7, r10
mov r6, r9
mov r5, r8
push {r5-r7}
sub sp, 0xC
lsls r0, 24
lsrs r6, r0, 24
lsls r0, r6, 2
mov r9, r0
adds r0, r6
lsls r5, r0, 3
ldr r1, =gTasks + 0x8
mov r8, r1
adds r0, r5, r1
adds r0, 0x18
bl sub_80FC670
cmp r0, 0
beq _081DA46E
movs r0, 0x8
negs r0, r0
add r0, r8
mov r10, r0
adds r4, r5, r0
movs r1, 0x8
ldrsh r0, [r4, r1]
cmp r0, 0
beq _081DA408
cmp r0, 0x1
beq _081DA42A
movs r0, 0
strh r0, [r4, 0x8]
strh r0, [r4, 0x20]
adds r0, r6, 0
bl SwitchTaskToFollowupFunc
b _081DA46E
.pool
_081DA408:
bl sub_800A520
lsls r0, 24
cmp r0, 0
beq _081DA46E
ldrh r1, [r4, 0x1A]
add r0, sp, 0x8
strh r1, [r0]
movs r1, 0x2
bl sub_80FC4F4
cmp r0, 0x1
bne _081DA46E
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
b _081DA46E
_081DA42A:
bl sub_80FC55C
lsls r0, 24
cmp r0, 0
beq _081DA46E
movs r1, 0
ldr r7, =gUnknown_02039F30
ldrb r0, [r7]
cmp r1, r0
bge _081DA460
mov r0, r8
adds r0, 0x2
adds r3, r5, r0
ldr r4, =gBlockRecvBuffer
mov r2, sp
movs r5, 0x80
lsls r5, 1
_081DA44C:
ldrh r0, [r4]
strh r0, [r2]
strh r0, [r3]
adds r3, 0x2
adds r4, r5
adds r2, 0x2
adds r1, 0x1
ldrb r0, [r7]
cmp r1, r0
blt _081DA44C
_081DA460:
mov r0, r9
adds r1, r0, r6
lsls r1, 3
add r1, r10
ldrh r0, [r1, 0x8]
adds r0, 0x1
strh r0, [r1, 0x8]
_081DA46E:
add sp, 0xC
pop {r3-r5}
mov r8, r3
mov r9, r4
mov r10, r5
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DA3B8
thumb_func_start sub_81DA488
sub_81DA488: @ 81DA488
push {r4-r7,lr}
mov r7, r8
push {r7}
lsls r0, 24
lsrs r6, r0, 24
lsls r7, r6, 2
adds r0, r7, r6
lsls r4, r0, 3
ldr r5, =gTasks + 0x8
adds r0, r4, r5
adds r0, 0x18
bl sub_80FC670
cmp r0, 0
beq _081DA55C
adds r0, r5, 0
subs r0, 0x8
adds r4, r0
movs r1, 0x8
ldrsh r0, [r4, r1]
cmp r0, 0
beq _081DA4CC
cmp r0, 0x1
beq _081DA50C
movs r0, 0
strh r0, [r4, 0x8]
strh r0, [r4, 0x20]
adds r0, r6, 0
bl SwitchTaskToFollowupFunc
b _081DA55C
.pool
_081DA4CC:
bl GetMultiplayerId
lsls r0, 24
cmp r0, 0
bne _081DA4FA
bl sub_800A520
lsls r0, 24
cmp r0, 0
beq _081DA55C
ldr r0, =gUnknown_02039F30
ldrb r2, [r0]
lsls r0, r2, 6
ldr r1, =gContestMons
adds r0, r1
movs r1, 0x4
subs r1, r2
lsls r1, 22
lsrs r1, 16
bl sub_80FC4F4
cmp r0, 0x1
bne _081DA55C
_081DA4FA:
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
b _081DA55C
.pool
_081DA50C:
movs r0, 0
bl sub_80FC530
lsls r0, 24
cmp r0, 0
beq _081DA55C
ldr r4, =gUnknown_02039F30
ldrb r3, [r4]
lsls r0, r3, 6
ldr r5, =gContestMons
adds r0, r5
ldr r1, =gBlockRecvBuffer
movs r2, 0x4
subs r2, r3
lsls r2, 6
bl memcpy
ldrb r4, [r4]
mov r8, r7
cmp r4, 0x3
bgt _081DA54C
lsls r0, r4, 6
adds r5, r0, r5
ldr r7, =gLinkPlayers
_081DA53C:
ldrh r1, [r7, 0x1A]
adds r0, r5, 0
bl sub_80DFA08
adds r5, 0x40
adds r4, 0x1
cmp r4, 0x3
ble _081DA53C
_081DA54C:
ldr r0, =gTasks
mov r2, r8
adds r1, r2, r6
lsls r1, 3
adds r1, r0
ldrh r0, [r1, 0x8]
adds r0, 0x1
strh r0, [r1, 0x8]
_081DA55C:
pop {r3}
mov r8, r3
pop {r4-r7}
pop {r0}
bx r0
.pool
thumb_func_end sub_81DA488
.align 2, 0 @ Don't pad with nop.

2181
asm/contest_painting_effects.s
View File

File diff suppressed because it is too large Load Diff

8
asm/pokenav.s
View File

@ -8173,7 +8173,7 @@ _081CAFA4:
ldrh r0, [r1, 0x1E]
bl GetTrainerIdxByRematchIdx
ldr r1, =gStringVar4
bl sub_81967AC
bl SelectMatchCallMessage
strb r0, [r6]
b _081CAFCC
.pool
@ -29322,14 +29322,14 @@ sub_81D5FB4: @ 81D5FB4
mov r9, r0
cmp r0, 0x6
bne _081D5FD2
bl sub_8087D74
bl InitMapFromSavedGame
b _081D605E
_081D5FD2:
bl sub_81D56B0
mov r0, r9
cmp r0, 0x5
bne _081D5FE6
bl sub_8087D74
bl InitMapFromSavedGame
bl sub_81D5710
b _081D605E
_081D5FE6:
@ -29340,7 +29340,7 @@ _081D5FE6:
ldr r0, =gMapHeader
ldr r0, [r0]
ldr r2, [r0, 0xC]
ldr r1, =gUnknown_03005DC0
ldr r1, =gBackupMapLayout
str r4, [r1, 0x8]
movs r0, 0x1F
str r0, [r1]

82
asm/rom_8011DC0.s
View File

@ -8257,7 +8257,7 @@ _0801AF24:
b _0801AF8A
.pool
_0801AF40:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801AFAE
@ -13680,7 +13680,7 @@ _0801DA72:
beq _0801DB46
b _0801DB5E
_0801DA7C:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801DB5E
@ -13713,7 +13713,7 @@ _0801DA7C:
b _0801DB3E
.pool
_0801DAC8:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801DB5E
@ -13752,7 +13752,7 @@ _0801DB08:
strh r0, [r4, 0x10]
b _0801DB5E
_0801DB1C:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801DB5E
@ -14364,7 +14364,7 @@ _0801DFCE:
adds r0, 0x1
strh r0, [r1, 0x6]
_0801DFE0:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E028
@ -14389,7 +14389,7 @@ _0801DFE0:
b _0801E028
.pool
_0801E018:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E028
@ -14838,7 +14838,7 @@ _0801E3AC:
b _0801E458
.pool
_0801E3D4:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E414
@ -14978,7 +14978,7 @@ _0801E4E8:
b _0801E59A
.pool
_0801E50C:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E5BC
@ -15013,7 +15013,7 @@ _0801E540:
b _0801E59A
.pool
_0801E560:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E5BC
@ -15100,7 +15100,7 @@ _0801E604:
lsls r0, 24
cmp r0, 0
bne _0801E662
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E662
@ -15212,7 +15212,7 @@ _0801E6F0:
lsrs r0, 24
cmp r0, 0x1
beq _0801E75C
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E75C
@ -15304,7 +15304,7 @@ _0801E7AC:
adds r0, 0x1
strh r0, [r1, 0x6]
_0801E7C0:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@ -15348,7 +15348,7 @@ _0801E812:
b _0801E830
.pool
_0801E820:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0801E830
@ -20715,7 +20715,7 @@ _08021358:
bl sub_8010434
b _0802143E
_0802135E:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08021444
@ -23804,7 +23804,7 @@ _08022CE4:
bl sub_8010434
b _08022D06
_08022CEA:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _08022D06
@ -24016,7 +24016,7 @@ _08022E6C:
bl sub_8010434
b _08022E9C
_08022E72:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08022EA2
@ -24148,7 +24148,7 @@ _08022F74:
bl sub_8010434
b _08023060
_08022F7A:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08023066
@ -24170,7 +24170,7 @@ _08022F7A:
bl SendBlock
b _08023060
_08022FAA:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08023066
@ -24300,7 +24300,7 @@ _080230A8:
bl sub_8010434
b _080231A8
_080230BA:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080231AE
@ -24369,7 +24369,7 @@ _08023120:
b _080231A8
.pool
_08023150:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080231AE
@ -24395,7 +24395,7 @@ _08023172:
bl sub_8010434
b _080231A8
_08023184:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080231AE
@ -24547,7 +24547,7 @@ _0802329C:
bl sub_8010434
b _080232DC
_080232BE:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080232E2
@ -24591,7 +24591,7 @@ _08023302:
beq _08023338
b _0802338C
_0802330C:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08023392
@ -24612,7 +24612,7 @@ _08023332:
bl sub_8010434
b _0802338C
_08023338:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08023392
@ -25683,7 +25683,7 @@ _08023B7A:
strh r0, [r4, 0x10]
b _08023BB2
_08023B94:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08023BB8
@ -25785,7 +25785,7 @@ _08023C2A:
bl SetGpuReg
b _08023C9C
_08023C5C:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08023CA2
@ -25884,7 +25884,7 @@ _08023D12:
bl SendBlock
b _0802402E
_08023D2A:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
bne _08023D36
@ -26227,7 +26227,7 @@ _08023FC4:
bl SendBlock
b _0802402E
_08023FD0:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08024034
@ -26451,7 +26451,7 @@ _080241A0:
bl sub_8010434
b _08024218
_080241A6:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0802421E
@ -26630,7 +26630,7 @@ _08024300:
bl sub_8010434
b _080243AC
_08024306:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080243B2
@ -26646,7 +26646,7 @@ _08024306:
bl SendBlock
b _080243AC
_08024328:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080243B2
@ -26914,7 +26914,7 @@ _08024522:
bl sub_8010434
b _08024558
_08024528:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0802455E
@ -27814,7 +27814,7 @@ _08024C4C:
bl sub_8010434
b _08024D20
_08024C5A:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08024D40
@ -28075,7 +28075,7 @@ _08024E90:
b _08024EF0
.pool
_08024EA0:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08024F08
@ -28116,7 +28116,7 @@ _08024EF0:
strb r0, [r1, 0x10]
b _08024F08
_08024EF8:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08024F08
@ -28475,7 +28475,7 @@ _080251BA:
strb r4, [r0, 0x8]
b _08025202
_080251D0:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08025226
@ -28560,7 +28560,7 @@ _08025252:
ldr r1, [r5]
b _080252CC
_08025274:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08025316
@ -28710,7 +28710,7 @@ _0802539C:
b _08025448
.pool
_080253BC:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _08025466
@ -28900,7 +28900,7 @@ _0802553C:
b _080255E8
.pool
_08025564:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0802563C
@ -29391,7 +29391,7 @@ _0802593E:
b _08025976
.pool
_0802596C:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _080259E8
@ -39683,7 +39683,7 @@ _0802AD3C:
b _0802ADC0
.pool
_0802AD68:
bl sub_800A520
bl IsLinkTaskFinished
lsls r0, 24
cmp r0, 0
beq _0802AE08

9634
asm/roulette.s
View File

File diff suppressed because it is too large Load Diff

14903
asm/trade.s
View File

File diff suppressed because it is too large Load Diff

2
common_syms/fieldmap.txt
View File

@ -1 +1 @@
gUnknown_03005DC0
gBackupMapLayout

230
data/battle_anim_scripts.s
View File

@ -766,7 +766,7 @@ Move_WAKE_UP_SLAP:
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTCKER, 3, 0, 0, 1, 2
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 2
waitforvisualfinish
createsprite gUnknown_085CE894, ANIM_TARGET, 2, 1, 8, 3
createsprite gSmellingSaltExclamationSpriteTemplate, ANIM_TARGET, 2, 1, 8, 3
loopsewithpan SE_W207B, +63, 16, 3
clearmonbg ANIM_DEF_PARTNER
blendoff
@ -3031,12 +3031,12 @@ Move_REVERSAL:
createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE
delay 10
playsewithpan SE_W179, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 0
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 42
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 84
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 126
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 168
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 210
createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0
createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42
createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84
createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 126
createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 168
createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210
waitforvisualfinish
delay 20
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
@ -3530,7 +3530,7 @@ Frustration_Strong:
createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28
waitforvisualfinish
delay 5
createvisualtask sub_815C3A8, 5
createvisualtask AnimTask_StrongFrustrationGrowAndShrink, 5
delay 7
playsewithpan SE_W004, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, 1, 1
@ -3564,7 +3564,7 @@ Frustration_Medium:
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
goto Frustration_Continue
Frustration_Weak:
createsprite gUnknown_085CE4D0, ANIM_ATTACKER, 2, 20, -28
createsprite gWeakFrustrationAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 20, -28
waitforvisualfinish
delay 10
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2
@ -3594,26 +3594,26 @@ Move_SAFEGUARD:
Move_PAIN_SPLIT:
loadspritegfx ANIM_TAG_PAIN_SPLIT
createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -8, -42, 0
createsprite gUnknown_085CE590, ANIM_TARGET, 2, -8, -42, 1
createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, ANIM_ATTACKER
createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, ANIM_TARGET
delay 10
playsewithpan SE_W207B, 0
createvisualtask sub_815CA20, 2, 0, 0
createvisualtask sub_815CA20, 2, 1, 0
createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 0
createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 0
waitforvisualfinish
createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -24, -42, 0
createsprite gUnknown_085CE590, ANIM_TARGET, 2, -24, -42, 1
createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -24, -42, ANIM_ATTACKER
createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -24, -42, ANIM_TARGET
delay 10
playsewithpan SE_W207B, 0
createvisualtask sub_815CA20, 2, 0, 1
createvisualtask sub_815CA20, 2, 1, 1
createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 1
createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 1
waitforvisualfinish
createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, 8, -42, 0
createsprite gUnknown_085CE590, ANIM_TARGET, 2, 8, -42, 1
createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, 8, -42, ANIM_ATTACKER
createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, 8, -42, ANIM_TARGET
delay 10
playsewithpan SE_W207B, 0
createvisualtask sub_815CA20, 2, 0, 2
createvisualtask sub_815CA20, 2, 1, 2
createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 2
createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 2
end
Move_VICE_GRIP:
@ -4667,7 +4667,7 @@ Move_KINESIS:
Move_GLARE:
loadspritegfx ANIM_TAG_SMALL_RED_EYE
loadspritegfx ANIM_TAG_EYE_SPARKLE
createvisualtask sub_815E114, 5, 0
createvisualtask AnimTask_GlareEyeDots, 5, 0
playsewithpan SE_W060B, SOUND_PAN_ATTACKER
waitforvisualfinish
createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK
@ -4684,7 +4684,7 @@ Move_GLARE:
Move_BARRAGE:
loadspritegfx ANIM_TAG_RED_BALL
createvisualtask sub_815E47C, 3
createvisualtask AnimTask_BarrageBall, 3
playsewithpan SE_W207, SOUND_PAN_ATTACKER
delay 24
createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 8, 1, 40, 1
@ -4775,7 +4775,7 @@ Move_SPLASH:
Move_ACID_ARMOR:
monbg ANIM_ATTACKER
setalpha 15, 0
createvisualtask sub_815D240, 2, 0
createvisualtask AnimTask_AcidArmor, 2, ANIM_ATTACKER
playsewithpan SE_W151, SOUND_PAN_ATTACKER
waitforvisualfinish
blendoff
@ -4875,7 +4875,7 @@ Move_FLAIL:
loadspritegfx ANIM_TAG_IMPACT
monbg ANIM_TARGET
setalpha 12, 8
createvisualtask sub_815C770, 2, 0
createvisualtask AnimTask_FlailMovement, 2, ANIM_ATTACKER
loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2
waitforvisualfinish
createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 3
@ -4937,7 +4937,7 @@ Move_FORESIGHT:
monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET
setalpha 16, 0
createsprite gUnknown_085CE8C4, ANIM_TARGET, 2, 1
createsprite gForesightMagnifyingGlassSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET
delay 17
loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4
delay 48
@ -4998,7 +4998,7 @@ EndureEffect:
Move_CHARM:
loadspritegfx ANIM_TAG_MAGENTA_HEART
createvisualtask sub_815C478, 5, 0, 2, 0
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
@ -5308,23 +5308,23 @@ Move_MEMENTO:
Move_FACADE:
loadspritegfx ANIM_TAG_SWEAT_DROP
createvisualtask sub_815DCA4, 2, 0, 3
createvisualtask sub_815DF0C, 2, 0, 72
createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 3
createvisualtask AnimTask_FacadeColorBlend, 2, ANIM_ATTACKER, 72
loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3
end
Move_SMELLING_SALT:
loadspritegfx ANIM_TAG_TAG_HAND
loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT
createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 0, 2
createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 1, 2
createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 2
createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 2
delay 32
createvisualtask sub_815E840, 3, 1, 2
createvisualtask AnimTask_SmellingSaltsSquish, 3, ANIM_TARGET, 2
loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2
waitforvisualfinish
delay 4
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2
createsprite gUnknown_085CE894, ANIM_TARGET, 2, 1, 8, 3
createsprite gSmellingSaltExclamationSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 8, 3
loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3
end
@ -5395,9 +5395,9 @@ Move_TAUNT:
Move_HELPING_HAND:
loadspritegfx ANIM_TAG_TAG_HAND
createvisualtask sub_815EC48, 5
createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 0
createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 1
createvisualtask AnimTask_HelpingHandAttackerMovement, 5
createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0
createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1
delay 19
playsewithpan SE_W227, 0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1
@ -5412,18 +5412,18 @@ Move_HELPING_HAND:
Move_ASSIST:
loadspritegfx ANIM_TAG_PAW_PRINT
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36
createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 112, -16, 140, 128, 36
delay 2
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36
createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 208, 128, -16, 48, 36
playsewithpan SE_W010, 0
delay 2
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36
createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 112, 256, -16, 36
playsewithpan SE_W010, 0
delay 2
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36
createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, 108, 128, 84, -16, 36
playsewithpan SE_W010, 0
delay 2
createsprite gUnknown_085CE804, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36
createsprite gAssistPawprintSpriteTemplate, ANIM_ATTACKER, 50, -16, 56, 256, 56, 36
playsewithpan SE_W010, 0
end
@ -5466,7 +5466,7 @@ Move_RECYCLE:
monbg ANIM_ATTACKER
setalpha 0, 16
delay 1
createsprite gUnknown_085CE9B0, ANIM_ATTACKER, 2
createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2
loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3
waitforvisualfinish
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1
@ -5543,24 +5543,24 @@ BrickBreakShatteredWall:
Move_YAWN:
loadspritegfx ANIM_TAG_PINK_CLOUD
createvisualtask sub_815D64C, 2, 0
createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER
playsewithpan SE_W281, SOUND_PAN_ATTACKER
waitforvisualfinish
createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 2
createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 2
playsewithpan SE_W255, SOUND_PAN_ATTACKER
delay 4
createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 1
createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 1
delay 4
createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 0
createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 0
waitforvisualfinish
createvisualtask sub_815D64C, 2, 1
createvisualtask AnimTask_DeepInhale, 2, ANIM_TARGET
playsewithpan SE_W281, SOUND_PAN_TARGET
end
Move_ENDEAVOR:
loadspritegfx ANIM_TAG_SWEAT_DROP
loadspritegfx ANIM_TAG_IMPACT
createvisualtask sub_815DCA4, 2, 0, 2
createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 2
loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2
delay 6
@ -5768,7 +5768,7 @@ Move_FEATHER_DANCE:
Move_TEETER_DANCE:
loadspritegfx ANIM_TAG_MUSIC_NOTES
loadspritegfx ANIM_TAG_DUCK
createvisualtask sub_8160164, 5
createvisualtask AnimTask_TeeterDanceMovement, 5
createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, 16, -2
playsewithpan SE_W298, SOUND_PAN_ATTACKER
delay 24
@ -5877,7 +5877,7 @@ Move_NEEDLE_ARM:
Move_SLACK_OFF:
loadspritegfx ANIM_TAG_BLUE_STAR
createvisualtask sub_8160544, 2, 0
createvisualtask AnimTask_SlackOffSquish, 2, ANIM_ATTACKER
playsewithpan SE_W281, SOUND_PAN_ATTACKER
waitforvisualfinish
call HealingEffect
@ -5950,7 +5950,7 @@ Move_FAKE_TEARS:
loadspritegfx ANIM_TAG_MUSIC_NOTES
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31)
waitforvisualfinish
createvisualtask sub_815C478, 5, 0, 2, 1
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 1
loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4
delay 8
createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 0
@ -5990,7 +5990,7 @@ Move_AIR_CUTTER:
Move_ODOR_SLEUTH:
monbg ANIM_TARGET
createvisualtask sub_815F620, 5
createvisualtask AnimTask_OdorSleuthMovement, 5
delay 24
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4
playsewithpan SE_W207, SOUND_PAN_ATTACKER
@ -6054,7 +6054,7 @@ Move_TICKLE:
delay 20
createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER
delay 12
createvisualtask sub_815C478, 3, 1, 6, 2
createvisualtask AnimTask_RockMonBackAndForth, 3, ANIM_TARGET, 6, 2
loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8
waitforvisualfinish
end
@ -6144,13 +6144,13 @@ Move_IRON_DEFENSE:
Move_BLOCK:
loadspritegfx ANIM_TAG_X_SIGN
createsprite gUnknown_085CE90C, ANIM_TARGET, 66
createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66
playsewithpan SE_W207, SOUND_PAN_TARGET
end
Move_HOWL:
loadspritegfx ANIM_TAG_NOISE_LINE
createvisualtask sub_815D64C, 2, 0
createvisualtask AnimTask_DeepInhale, 2, 0
delay 12
call RoarEffect
createvisualtask sub_8158D8C, 2, 0, 3
@ -6171,7 +6171,7 @@ Move_BULK_UP:
Move_COVET:
loadspritegfx ANIM_TAG_MAGENTA_HEART
loadspritegfx ANIM_TAG_ITEM_BAG
createvisualtask sub_815C478, 5, 0, 2, 0
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15
@ -6752,13 +6752,13 @@ Move_ROAR:
end
RoarEffect:
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1
createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 0
createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 2
createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1
delay 15
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1
createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 0
createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 2
createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1
return
Move_GROWL:
@ -10091,38 +10091,38 @@ MorningSun1:
Move_SWEET_SCENT:
loadspritegfx ANIM_TAG_PINK_PETAL
playsewithpan SE_W230, SOUND_PAN_ATTACKER
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 100
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 100
delay 25
setpan 0
call SweetScentEffect
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 55, 0
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 55, 0
setpan SOUND_PAN_TARGET
createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21)
call SweetScentEffect
waitforvisualfinish
end
SweetScentEffect:
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 70, 1, 64
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 70, 1, 64
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 60, 0, 64
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 60, 0, 64
delay 5
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 80, 1, 64
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 80, 1, 64
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 58, 0, 120
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 58, 0, 120
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 120
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 90, 0, 64
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 90, 0, 64
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 48, 0, 64
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 48, 0, 64
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 95, 1, 80
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 95, 1, 80
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 120
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 75, 1, 64
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 75, 1, 64
delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 85, 0, 120
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 85, 0, 120
delay 2
return
@ -10183,32 +10183,32 @@ Move_FLATTER:
createvisualtask sub_815ABEC, 2
createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0
waitforvisualfinish
createsprite gUnknown_085CE5C0, ANIM_TARGET, 2, 0, -8, 80
createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80
delay 0
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET
delay 10
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET
delay 0
createvisualtask sub_8159210, 5, 229, SOUND_PAN_ATTACKER
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call Flatter1
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
call CreateFlatterConfetti
delay 5
createvisualtask sub_8159210, 5, 229, SOUND_PAN_TARGET
waitforvisualfinish
@ -10216,9 +10216,9 @@ Move_FLATTER:
waitforvisualfinish
createvisualtask sub_815AC8C, 2
end
Flatter1:
createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 0
createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 1
CreateFlatterConfetti:
createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, ANIM_ATTACKER
createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, ANIM_TARGET
return
Move_ROLE_PLAY:
@ -10228,7 +10228,7 @@ Move_ROLE_PLAY:
waitforvisualfinish
playsewithpan SE_W161, SOUND_PAN_ATTACKER
waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30
createvisualtask sub_815CED8, 2
createvisualtask AnimTask_RolePlaySilhouette, 2
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE
@ -10497,12 +10497,12 @@ Move_METEOR_MASH:
fadetobg BG_COSMIC
waitbgfadein
waitforvisualfinish
createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -48, SOUND_PAN_ATTACKER, 72, 32, 30
createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -48, -64, 72, 32, 30
delay 10
createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -112, SOUND_PAN_ATTACKER, 8, 32, 30
createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -112, -64, 8, 32, 30
delay 40
createsprite gUnknown_08595F14, ANIM_TARGET, 3, 0, 0, 0, 30
createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -80, SOUND_PAN_ATTACKER, 40, 32, 30
createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -80, -64, 40, 32, 30
delay 20
playsewithpan SE_W233B, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
@ -11330,7 +11330,7 @@ Move_KNOCK_OFF:
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
delay 4
playsewithpan SE_W233, SOUND_PAN_TARGET
createsprite gUnknown_085CE984, ANIM_TARGET, 2, -16, -16
createsprite gKnockOffStrikeSpriteTemplate, ANIM_TARGET, 2, -16, -16
delay 8
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2
@ -12232,31 +12232,31 @@ General_SmokeballEscape:
setalpha 12, 4
delay 0
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_TARGET, 0, 0, 32, 28, 30
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_TARGET, 0, 0, 32, 28, 30
delay 4
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_ATTACKER, 127, 2, 12, 20, 30
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 127, 2, 12, 20, 30
delay 12
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_ATTACKER, 126, 2, -28, 4, 30
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 126, 2, -28, 4, 30
delay 12
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_ATTACKER, 124, 2, 14, -20, 30
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 124, 2, 14, -20, 30
delay 4
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createvisualtask sub_81136E8, 2, 2
createsprite gUnknown_085CE734, ANIM_ATTACKER, 123, 3, 4, 4, 30
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 123, 3, 4, 4, 30
delay 14
playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createsprite gUnknown_085CE734, ANIM_ATTACKER, 122, 3, -14, 18, 46
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 46
delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 121, 3, 14, -14, 46
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, -14, 46
delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 120, 3, -12, -10, 46
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 120, 3, -12, -10, 46
delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 119, 3, 14, 14, 46
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 119, 3, 14, 14, 46
delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 118, 3, 0, 0, 46
createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 118, 3, 0, 0, 46
waitforvisualfinish
clearmonbg ANIM_ATTACKER
invisible ANIM_ATTACKER
@ -12338,11 +12338,11 @@ SnatchMoveContinue:
end
SnatchOpposingMonMove:
playsewithpan SE_W104, SOUND_PAN_ATTACKER
createvisualtask sub_815F8F4, 2
createvisualtask AnimTask_SnatchOpposingMonMove, 2
goto SnatchMoveContinue
SnatchPartnerMonMove:
playsewithpan SE_W104, SOUND_PAN_ATTACKER
createvisualtask sub_815FFC4, 2
createvisualtask AnimTask_SnatchPartnerMove, 2
goto SnatchMoveContinue
General_FutureSightHit:

434
data/battle_frontier_1.s
View File

@ -1,434 +0,0 @@
#include "constants/flags.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_0860DEB8:: @ 860DEB8 //struct
.2byte 0x0025, 0x0000, 0x0108, 0x0208, 0x0308, 0x0103, 0x0008, 0x0108, 0x0208, 0x0000
.2byte 0x02e1, 0x0000, 0x010c, 0x020c, 0x030c, 0x013e, 0x000c, 0x010c, 0x020c, 0x0000
.2byte 0x002c, 0x0000, 0x010c, 0x020c, 0x030c, 0x0104, 0x000c, 0x010c, 0x020c, 0x0000
.2byte 0x0039, 0x0000, 0x0102, 0x0202, 0x0302, 0x0105, 0x0002, 0x0102, 0x0202, 0x0000
.2byte 0x0040, 0x0000, 0x0101, 0x0201, 0x0301, 0x0106, 0x0001, 0x0101, 0x0201, 0x0000
.2byte 0x02af, 0x0004, 0x0101, 0x0201, 0x0301, 0x013d, 0x0001, 0x0101, 0x0201, 0x0000
.2byte 0x02ff, 0x0000, 0x010a, 0x020a, 0x030a, 0x0140, 0x000a, 0x010a, 0x020a, 0x0000
.2byte 0x005e, 0x0000, 0x0109, 0x0209, 0x0309, 0x0108, 0x0009, 0x0109, 0x0209, 0x0000
.2byte 0x004e, 0x0000, 0x0106, 0x0206, 0x0306, 0x0107, 0x0006, 0x0106, 0x0206, 0x0000
.2byte 0x006c, 0x0000, 0x0108, 0x0208, 0x0308, 0x0109, 0x0008, 0x0108, 0x0208, 0x0000
.2byte 0x0072, 0x0000, 0x0108, 0x0208, 0x0308, 0x010a, 0x0008, 0x0108, 0x0208, 0x0000
.2byte 0x0090, 0x0000, 0x0108, 0x020a, 0x030a, 0x010e, 0x000a, 0x0108, 0x020a, 0x0000
.2byte 0x007f, 0x0000, 0x010a, 0x020a, 0x030a, 0x010b, 0x000a, 0x0108, 0x020a, 0x0000
.2byte 0x0088, 0x0000, 0x0104, 0x0204, 0x0304, 0x010c, 0x0004, 0x0104, 0x0204, 0x0000
.2byte 0x008f, 0x0000, 0x0107, 0x0207, 0x0307, 0x010d, 0x0007, 0x0107, 0x0207, 0x0000
.2byte 0x009b, 0x0000, 0x0105, 0x0205, 0x0305, 0x010f, 0x0005, 0x0105, 0x0205, 0x0000
.2byte 0x00b7, 0x0000, 0x0103, 0x0203, 0x0303, 0x0110, 0x0003, 0x0103, 0x0203, 0x0000
.2byte 0x02a0, 0x0000, 0x0103, 0x0203, 0x0303, 0x013b, 0x0003, 0x0103, 0x0203, 0x0000
.2byte 0x00c3, 0x0000, 0x0106, 0x0206, 0x0306, 0x0111, 0x0006, 0x0106, 0x0206, 0x0000
.2byte 0x00c4, 0x0000, 0x0104, 0x0204, 0x0304, 0x0112, 0x0004, 0x0104, 0x0204, 0x0000
.2byte 0x00ce, 0x0000, 0x010b, 0x020b, 0x030b, 0x0113, 0x000b, 0x010b, 0x020b, 0x0000
.2byte 0x00d8, 0x0000, 0x0101, 0x0201, 0x0301, 0x0114, 0x0001, 0x0101, 0x0201, 0x0000
.2byte 0x02a9, 0x0003, 0x010c, 0x020c, 0x030c, 0x013c, 0x000c, 0x010c, 0x020c, 0x0000
.2byte 0x00e2, 0x0000, 0x0107, 0x0207, 0x0307, 0x0115, 0x0007, 0x0107, 0x0207, 0x0000
.2byte 0x00ee, 0x0000, 0x0104, 0x0204, 0x0304, 0x0116, 0x0001, 0x0104, 0x0204, 0x0000
.2byte 0x00f9, 0x0000, 0x0108, 0x0208, 0x0308, 0x0117, 0x0008, 0x0108, 0x0208, 0x0000
.2byte 0x00fe, 0x0000, 0x010c, 0x020c, 0x030c, 0x0118, 0x000c, 0x010c, 0x020c, 0x0000
.2byte 0x0118, 0x0000, 0x0102, 0x0202, 0x0302, 0x011a, 0x0002, 0x0102, 0x0202, 0x0000
.2byte 0x0111, 0x0000, 0x0101, 0x0201, 0x0301, 0x0119, 0x0001, 0x0101, 0x0201, 0x0000
.2byte 0x011f, 0x0006, 0x0109, 0x0209, 0x0309, 0x011b, 0x0009, 0x0109, 0x0209, 0x0000
.2byte 0x012e, 0x0000, 0x010e, 0x020e, 0x030e, 0x011d, 0x000e, 0x010e, 0x020e, 0x0000
.2byte 0x0125, 0x0000, 0x010b, 0x020b, 0x030b, 0x011c, 0x000b, 0x010b, 0x020b, 0x0000
.2byte 0x0133, 0x0000, 0x010c, 0x020c, 0x030c, 0x011e, 0x000c, 0x010c, 0x020c, 0x0000
.2byte 0x0139, 0x0000, 0x010d, 0x020d, 0x030d, 0x011f, 0x000d, 0x010d, 0x020d, 0x0000
.2byte 0x013e, 0x0000, 0x0101, 0x0201, 0x0301, 0x0120, 0x0001, 0x0101, 0x0201, 0x0000
.2byte 0x0153, 0x0000, 0x0103, 0x0203, 0x0303, 0x0121, 0x0003, 0x0103, 0x0203, 0x0000
.2byte 0x0178, 0x0000, 0x0105, 0x0205, 0x0305, 0x0126, 0x0005, 0x0105, 0x0205, 0x0000
.2byte 0x0171, 0x0000, 0x0109, 0x0209, 0x0309, 0x0125, 0x0009, 0x0109, 0x0209, 0x0000
.2byte 0x0166, 0x0000, 0x0109, 0x0209, 0x0309, 0x0123, 0x0009, 0x0109, 0x0209, 0x0000
.2byte 0x016c, 0x0000, 0x0105, 0x0205, 0x0305, 0x0124, 0x0005, 0x0105, 0x0205, 0x0000
.2byte 0x0182, 0x0000, 0x0109, 0x0209, 0x0309, 0x0128, 0x0009, 0x0109, 0x0209, 0x0000
.2byte 0x0161, 0x0000, 0x0105, 0x0205, 0x0305, 0x0122, 0x0005, 0x0105, 0x0205, 0x0000
.2byte 0x0179, 0x0000, 0x0105, 0x0205, 0x0305, 0x0127, 0x0005, 0x0105, 0x0205, 0x0000
.2byte 0x0188, 0x0000, 0x0104, 0x0204, 0x0304, 0x0129, 0x0004, 0x0104, 0x0204, 0x0000
.2byte 0x0196, 0x0000, 0x0106, 0x0206, 0x0306, 0x012a, 0x0006, 0x0106, 0x0206, 0x0000
.2byte 0x01a3, 0x0000, 0x0101, 0x0201, 0x0301, 0x012b, 0x0001, 0x0101, 0x0201, 0x0000
.2byte 0x01ab, 0x0000, 0x0109, 0x0209, 0x0309, 0x012c, 0x0009, 0x0109, 0x0209, 0x0000
.2byte 0x01b2, 0x0000, 0x0108, 0x0208, 0x0308, 0x012d, 0x0008, 0x0108, 0x0208, 0x0000
.2byte 0x01c1, 0x0000, 0x0109, 0x0209, 0x0309, 0x012e, 0x0009, 0x0109, 0x0209, 0x0000
.2byte 0x01da, 0x0000, 0x0102, 0x0202, 0x0302, 0x012f, 0x0002, 0x0102, 0x0202, 0x0000
.2byte 0x01e1, 0x0002, 0x0102, 0x0202, 0x0302, 0x0130, 0x0001, 0x0102, 0x0202, 0x0000
.2byte 0x01ec, 0x0000, 0x0103, 0x0203, 0x0303, 0x0131, 0x0003, 0x0103, 0x0203, 0x0000
.2byte 0x02e4, 0x0000, 0x0103, 0x0203, 0x0303, 0x013f, 0x0003, 0x0103, 0x0203, 0x0000
.2byte 0x0200, 0x0000, 0x0107, 0x0207, 0x0307, 0x0132, 0x0007, 0x0107, 0x0207, 0x0000
.2byte 0x0221, 0x0000, 0x0108, 0x0208, 0x0308, 0x0134, 0x0008, 0x0108, 0x0208, 0x0000
.2byte 0x021a, 0x0000, 0x0105, 0x0205, 0x0305, 0x0133, 0x0005, 0x0105, 0x0205, 0x0000
.2byte 0x0009, 0x0000, 0x0108, 0x0208, 0x0308, 0x0102, 0x0008, 0x0108, 0x0208, 0x0000
.2byte 0x022f, 0x0000, 0x0109, 0x0209, 0x0309, 0x0136, 0x0009, 0x0109, 0x0209, 0x0000
.2byte 0x0228, 0x0000, 0x0105, 0x0205, 0x0305, 0x0135, 0x0005, 0x0105, 0x0205, 0x0000
.2byte 0x025c, 0x0000, 0x0102, 0x0202, 0x0302, 0x0137, 0x0002, 0x0102, 0x0202, 0x0000
.2byte 0x026d, 0x0000, 0x0101, 0x0201, 0x0301, 0x0138, 0x0001, 0x0101, 0x0201, 0x0000
.2byte 0x0273, 0x0000, 0x0103, 0x0203, 0x0303, 0x0139, 0x0003, 0x0103, 0x0203, 0x0000
.2byte 0x0001, 0x0000, 0x010f, 0x0203, 0x0303, 0x0101, 0x0003, 0x0103, 0x0203, 0x0000
.2byte 0x0282, 0x0001, 0x0109, 0x0209, 0x0309, 0x013a, 0x0009, 0x0109, 0x0209, 0x0000
.align 2
gUnknown_0860E3B8:: @ 860E3B8
.4byte BattleFrontier_PokeNav_2A971C, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A9798, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A9813, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A98A8, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A9977, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A99FD, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A9A78, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A9AE8, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A9BA7, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A9C36, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A9CC8, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A9D44, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A9DD7, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A9E70, 0x00ff0200
.4byte BattleFrontier_PokeNav_2A9EFD, 0x00ff0200
.align 2
gUnknown_0860E430:: @ 860E430
.4byte BattleFrontier_PokeNav_2A9FAB, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AA028, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AA099, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AA100, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AA188, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AA214, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AA2A1, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AA31B, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AA3A8, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AA442, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AA4C5, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AA520, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AA5AD, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AA64D, 0x00ffff00
.align 2
gUnknown_0860E4A0:: @ 860E4A0
.4byte BattleFrontier_PokeNav_2AA6AF, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AA730, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AA77A, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AA81C, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AA88C, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AA934, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AA9D3, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AAA40, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AAAE4, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AAB8C, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AAC25, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AAC9D, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AAD41, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AAE00, 0x00ff0300
.align 2
gUnknown_0860E510:: @ 860E510
.4byte BattleFrontier_PokeNav_2AAE7F, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AAEF1, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AAF69, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB010, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB076, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB11A, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB1B4, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB23D, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB2E9, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB382, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB410, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB4B0, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB538, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB5E4, 0x00ff0100
.align 2
gUnknown_0860E580:: @ 860E580
.4byte BattleFrontier_PokeNav_2AB670, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB6CD, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB73C, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB808, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB8B7, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AB95D, 0x00ff0100
.4byte BattleFrontier_PokeNav_2ABA03, 0x00ff0100
.4byte BattleFrontier_PokeNav_2ABA9F, 0x00ff0100
.4byte BattleFrontier_PokeNav_2ABB62, 0x00ff0100
.4byte BattleFrontier_PokeNav_2ABC26, 0x00ff0100
.4byte BattleFrontier_PokeNav_2ABCE9, 0x00ff0100
.4byte BattleFrontier_PokeNav_2ABDA2, 0x00ff0100
.4byte BattleFrontier_PokeNav_2ABE5E, 0x00ff0100
.4byte BattleFrontier_PokeNav_2ABF36, 0x00ff0100
.align 2
gUnknown_0860E5F0:: @ 860E5F0
.4byte BattleFrontier_PokeNav_2AC009, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AC0BD, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AC18C, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AC228, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AC30C, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AC3B6, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AC446, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AC5C7, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AC682, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AC755, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AC82C, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AC914, 0x00ffff00
.4byte BattleFrontier_PokeNav_2ACA59, 0x00ff0200
.4byte BattleFrontier_PokeNav_2ACB02, 0x00ffff00
.4byte BattleFrontier_PokeNav_2ACC3F, 0x00ffff00
.4byte BattleFrontier_PokeNav_2ACD2F, 0x00ffff00
.4byte BattleFrontier_PokeNav_2ACE1E, 0x00ffff00
.4byte BattleFrontier_PokeNav_2ACF32, 0x00ff0300
.4byte BattleFrontier_PokeNav_2ACFBE, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AD0AC, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AD194, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AD1DF, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AD2A8, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AD34F, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AD44E, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AD53A, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AD642, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AD801, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AD92E, 0x00ff0300
.4byte BattleFrontier_PokeNav_2ADA8F, 0x00ffff00
.4byte BattleFrontier_PokeNav_2ADB9B, 0x00ffff00
.4byte BattleFrontier_PokeNav_2ADC92, 0x00ffff00
.4byte BattleFrontier_PokeNav_2ADE08, 0x00ffff00
.4byte BattleFrontier_PokeNav_2ADF07, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AE0D9, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AE1FD, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AE327, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AE3DA, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AE489, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AE5CD, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AE698, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AE704, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AE78F, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AE859, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AE8E6, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AE998, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AEA8F, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AEB77, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AEBFA, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AECC1, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AED52, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AEE35, 0x00ff0300
.4byte BattleFrontier_PokeNav_2AEEF4, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AEFDA, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AF0E7, 0x00ff0100
.4byte BattleFrontier_PokeNav_2AF1B8, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AF2C4, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AF371, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AF480, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AF671, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AF7D8, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AF8F7, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AFA39, 0x00ffff00
.4byte BattleFrontier_PokeNav_2AFB26, 0x00ffff00
.align 2
gUnknown_0860E7F0:: @860E7F0
.4byte BattleFrontier_PokeNav_2AFC07, 0x00050400
.4byte BattleFrontier_PokeNav_2AFC78, 0x00050400
.4byte BattleFrontier_PokeNav_2AFCFF, 0x00050400
.4byte BattleFrontier_PokeNav_2AFDA7, 0x00050400
.4byte BattleFrontier_PokeNav_2AFE3D, 0x00050400
.4byte BattleFrontier_PokeNav_2AFECA, 0x00050400
.4byte BattleFrontier_PokeNav_2AFF64, 0x00050400
.4byte BattleFrontier_PokeNav_2AFFF0, 0x00050400
.4byte BattleFrontier_PokeNav_2B00B5, 0x00050400
.4byte BattleFrontier_PokeNav_2B0129, 0x00050400
.4byte BattleFrontier_PokeNav_2B01A5, 0x00050400
.4byte BattleFrontier_PokeNav_2B0232, 0x00050400
.4byte BattleFrontier_PokeNav_2B02D9, 0x00050400
.4byte BattleFrontier_PokeNav_2B0366, 0x00050400
.align 2
gUnknown_0860E860:: @860E860
.4byte BattleFrontier_PokeNav_2B03E6, 0x00050400
.4byte BattleFrontier_PokeNav_2B0457, 0x00050400
.4byte BattleFrontier_PokeNav_2B04DE, 0x00050400
.4byte BattleFrontier_PokeNav_2B0586, 0x00050400
.4byte BattleFrontier_PokeNav_2B061C, 0x00050400
.4byte BattleFrontier_PokeNav_2B06A3, 0x00050400
.4byte BattleFrontier_PokeNav_2B073B, 0x00050400
.4byte BattleFrontier_PokeNav_2B07C7, 0x00050400
.4byte BattleFrontier_PokeNav_2B0894, 0x00050400
.4byte BattleFrontier_PokeNav_2B0908, 0x00050400
.4byte BattleFrontier_PokeNav_2B0984, 0x00050400
.4byte BattleFrontier_PokeNav_2B0A11, 0x00050400
.4byte BattleFrontier_PokeNav_2B0AB8, 0x00050400
.4byte BattleFrontier_PokeNav_2B0B45, 0x00050400
.align 2
gUnknown_0860E8D0:: @860E8D0
.4byte BattleFrontier_PokeNav_2B0BC5, 0x00050400
.4byte BattleFrontier_PokeNav_2B0C4A, 0x00050400
.4byte BattleFrontier_PokeNav_2B0CC7, 0x00050400
.4byte BattleFrontier_PokeNav_2B0D4A, 0x00050400
.4byte BattleFrontier_PokeNav_2B0DC8, 0x00050400
.4byte BattleFrontier_PokeNav_2B0E35, 0x00050400
.4byte BattleFrontier_PokeNav_2B0ED1, 0x00050400
.4byte BattleFrontier_PokeNav_2B0F72, 0x00050400
.4byte BattleFrontier_PokeNav_2B102A, 0x00050400
.4byte BattleFrontier_PokeNav_2B10A7, 0x00050400
.4byte BattleFrontier_PokeNav_2B1121, 0x00050400
.4byte BattleFrontier_PokeNav_2B11D3, 0x00050400
.4byte BattleFrontier_PokeNav_2B124D, 0x00050400
.4byte BattleFrontier_PokeNav_2B12D0, 0x00050400
.align 2
gUnknown_0860E940:: @860E940
.4byte BattleFrontier_PokeNav_2B1347, 0x00050400
.4byte BattleFrontier_PokeNav_2B13B1, 0x00050400
.4byte BattleFrontier_PokeNav_2B142B, 0x00050400
.4byte BattleFrontier_PokeNav_2B14B4, 0x00050400
.4byte BattleFrontier_PokeNav_2B1525, 0x00050400
.4byte BattleFrontier_PokeNav_2B158E, 0x00050400
.4byte BattleFrontier_PokeNav_2B1622, 0x00050400
.4byte BattleFrontier_PokeNav_2B169D, 0x00050400
.4byte BattleFrontier_PokeNav_2B1775, 0x00050400
.4byte BattleFrontier_PokeNav_2B17F8, 0x00050400
.4byte BattleFrontier_PokeNav_2B1877, 0x00050400
.4byte BattleFrontier_PokeNav_2B1946, 0x00050400
.4byte BattleFrontier_PokeNav_2B19C7, 0x00050400
.4byte BattleFrontier_PokeNav_2B1A4C, 0x00050400
.align 2
gUnknown_0860E9B0:: @860E9B0
.4byte BattleFrontier_PokeNav_2B1ACA, 0x00050400
.4byte BattleFrontier_PokeNav_2B1B50, 0x00050400
.4byte BattleFrontier_PokeNav_2B1BE4, 0x00050400
.4byte BattleFrontier_PokeNav_2B1C6A, 0x00050400
.4byte BattleFrontier_PokeNav_2B1CCF, 0x00050400
.4byte BattleFrontier_PokeNav_2B1D38, 0x00050400
.4byte BattleFrontier_PokeNav_2B1DCD, 0x00050400
.4byte BattleFrontier_PokeNav_2B1E4B, 0x00050400
.4byte BattleFrontier_PokeNav_2B1F24, 0x00050400
.4byte BattleFrontier_PokeNav_2B1FA8, 0x00050400
.4byte BattleFrontier_PokeNav_2B2022, 0x00050400
.4byte BattleFrontier_PokeNav_2B20F3, 0x00050400
.4byte BattleFrontier_PokeNav_2B2175, 0x00050400
.4byte BattleFrontier_PokeNav_2B21FC, 0x00050400
.align 2
gUnknown_0860EA20:: @ 860EA20
.4byte gUnknown_0860E3B8
.4byte gUnknown_0860E430
.4byte gUnknown_0860E4A0
.align 2
gUnknown_0860EA2C:: @ 860EA2C
.4byte gUnknown_0860E510
.4byte gUnknown_0860E580
.align 2
gUnknown_0860EA34:: @ 860EA34
.4byte gUnknown_0860E5F0
.4byte gUnknown_0860E7F0
.4byte gUnknown_0860E860
.4byte gUnknown_0860E8D0
.4byte gUnknown_0860E940
.4byte gUnknown_0860E9B0
.align 2
gUnknown_0860EA4C:: @ 860EA4C
.incbin "graphics/unknown/unknown_60EA4C.gbapal"
.align 2
gUnknown_0860EA6C:: @ 860EA6C
.incbin "graphics/interface/menu_border.4bpp"
.align 2
gUnknown_0860EB6C:: @ 860EB6C
.incbin "graphics/pokenav/icon.gbapal"
.align 2
gUnknown_0860EB8C:: @ 860EB8C
.incbin "graphics/pokenav/icon.4bpp.lz"
.align 2
gText_PokenavCallEllipsis:: @ 860EF70
.string "………………\p$"
.align 2
gUnknown_0860EF78:: @ 860EF78
.4byte sub_819612C
.4byte sub_81961F0
.4byte sub_8196274
.4byte sub_81962B0
.4byte sub_81962D8
.4byte sub_8196330
.4byte sub_8196390
.4byte sub_81963F0
.align 2
gUnknown_0860EF98:: @ 860EF98
window_template 0x00, 0x01, 0x0f, 0x1c, 0x04, 0x0f, 0x0200
.align 2
gUnknown_0860EFA0:: @ 860EFA0
.4byte gStringVar1
.4byte gStringVar2
.4byte gStringVar3
.align 2
gUnknown_0860EFAC:: @ 860EFAC
.4byte sub_8196A44
.4byte sub_8196A9C
.4byte sub_8196B98
.4byte sub_8196C70
.4byte sub_8196CF4
.4byte sub_8196D14
.align 2
gUnknown_0860EFC4:: @ 860EFC4
.4byte 0x00000282, gText_Kira
.4byte 0x000001e1, gText_Amy
.4byte 0x000002a9, gText_John
.4byte 0x000002af, gText_Roy
.4byte 0x00000033, gText_Gabby
.4byte 0x0000011f, gText_Anna
.align 2
gUnknown_0860EFF4:: @ 860EFF4
.4byte gText_BattleTower2
.4byte gText_BattleDome
.4byte gText_BattlePalace
.4byte gText_BattleArena
.4byte gText_BattlePike
.4byte gText_BattleFactory
.4byte gText_BattlePyramid
.align 2
gUnknown_0860F010:: @ 860F010
.2byte FLAG_BADGE01_GET
.2byte FLAG_BADGE02_GET
.2byte FLAG_BADGE03_GET
.2byte FLAG_BADGE04_GET
.2byte FLAG_BADGE05_GET
.2byte FLAG_BADGE06_GET
.2byte FLAG_BADGE07_GET
.2byte FLAG_BADGE08_GET
gUnknown_0860F020:: @ 860F020
.4byte gBirchDexRatingText_LessThan10
.4byte gBirchDexRatingText_LessThan20
.4byte gBirchDexRatingText_LessThan30
.4byte gBirchDexRatingText_LessThan40
.4byte gBirchDexRatingText_LessThan50
.4byte gBirchDexRatingText_LessThan60
.4byte gBirchDexRatingText_LessThan70
.4byte gBirchDexRatingText_LessThan80
.4byte gBirchDexRatingText_LessThan90
.4byte gBirchDexRatingText_LessThan100
.4byte gBirchDexRatingText_LessThan110
.4byte gBirchDexRatingText_LessThan120
.4byte gBirchDexRatingText_LessThan130
.4byte gBirchDexRatingText_LessThan140
.4byte gBirchDexRatingText_LessThan150
.4byte gBirchDexRatingText_LessThan160
.4byte gBirchDexRatingText_LessThan170
.4byte gBirchDexRatingText_LessThan180
.4byte gBirchDexRatingText_LessThan190
.4byte gBirchDexRatingText_LessThan200
.4byte gBirchDexRatingText_DexCompleted

3053
data/event_scripts.s
View File

File diff suppressed because it is too large Load Diff

2
data/field_effect_scripts.s
View File

@ -341,5 +341,5 @@ gFieldEffectScript_Unknown65:: @ 82DBCF9
field_eff_end
gFieldEffectScript_Unknown66:: @ 82DBCFF
field_eff_callnative sub_80B9E28
field_eff_callnative Fldeff_MoveDeoxysRock
field_eff_end

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

@ -4,7 +4,7 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1
AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2
lock
faceplayer
goto_if_set FLAG_TRADED_SCANNER_TO_STERN, AbandonedShip_CaptainsOffice_EventScript_23881A
goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_23881A
checkitem ITEM_SCANNER, 1
compare VAR_RESULT, 1
goto_if_eq AbandonedShip_CaptainsOffice_EventScript_238810

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

@ -8,8 +8,8 @@ AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F
end
AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98
call_if_unset FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DAB
call_if_set FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DB5
call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DAB
call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DB5
end
AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB
@ -26,14 +26,14 @@ AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF
AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8
lockall
goto_if_set FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237E09
goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237E09
checkitem ITEM_STORAGE_KEY, 1
compare VAR_RESULT, 0
goto_if_eq AbandonedShip_Corridors_B1F_EventScript_237DFF
msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_STORAGE_KEY, 1
setflag FLAG_0x0EF
setflag FLAG_USED_STORAGE_KEY
call AbandonedShip_Corridors_B1F_EventScript_237DB5
special DrawWholeMapView
releaseall

32
data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
View File

@ -8,14 +8,14 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977
end
AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980
call_if_unset FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1
call_if_unset FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB
call_if_unset FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238A05
call_if_unset FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F
call_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
call_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
call_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
call_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1
call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB
call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A05
call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F
call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
end
AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9
@ -52,14 +52,14 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F
AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
lockall
goto_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
checkitem ITEM_ROOM_1_KEY, 1
compare VAR_RESULT, 0
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_ROOM_1_KEY, 1
setflag FLAG_0x0F0
setflag FLAG_USED_ROOM_1_KEY
call AbandonedShip_HiddenFloorCorridors_EventScript_2389C9
special DrawWholeMapView
releaseall
@ -67,14 +67,14 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50
lockall
goto_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
checkitem ITEM_ROOM_2_KEY, 1
compare VAR_RESULT, 0
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_ROOM_2_KEY, 1
setflag FLAG_0x0F1
setflag FLAG_USED_ROOM_2_KEY
call AbandonedShip_HiddenFloorCorridors_EventScript_2389D3
special DrawWholeMapView
releaseall
@ -82,14 +82,14 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50
AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87
lockall
goto_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
checkitem ITEM_ROOM_4_KEY, 1
compare VAR_RESULT, 0
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_ROOM_4_KEY, 1
setflag FLAG_0x0F2
setflag FLAG_USED_ROOM_4_KEY
call AbandonedShip_HiddenFloorCorridors_EventScript_2389DD
special DrawWholeMapView
releaseall
@ -97,14 +97,14 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87
AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE
lockall
goto_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
checkitem ITEM_ROOM_6_KEY, 1
compare VAR_RESULT, 0
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13
msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT
playse SE_PIN
takeitem ITEM_ROOM_6_KEY, 1
setflag FLAG_0x0F3
setflag FLAG_USED_ROOM_6_KEY
call AbandonedShip_HiddenFloorCorridors_EventScript_2389E7
special DrawWholeMapView
releaseall

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

@ -17,7 +17,7 @@ AncientTomb_EventScript_238FCD:: @ 8238FCD
AncientTomb_MapScript1_238FE1: @ 8238FE1
setflag FLAG_LANDMARK_ANCIENT_TOMB
call_if_unset FLAG_0x1BD, AncientTomb_EventScript_238FEE
call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_238FEE
end
AncientTomb_EventScript_238FEE:: @ 8238FEE
@ -78,12 +78,12 @@ AncientTomb_EventScript_23905A:: @ 823905A
goto_if_eq AncientTomb_EventScript_2390AA
compare VAR_RESULT, 5
goto_if_eq AncientTomb_EventScript_2390AA
setflag FLAG_0x1BD
setflag FLAG_DEFEATED_REGISTEEL
release
end
AncientTomb_EventScript_2390A1:: @ 82390A1
setflag FLAG_0x1BD
setflag FLAG_DEFEATED_REGISTEEL
goto AncientTomb_EventScript_27376D
end

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

@ -4,8 +4,8 @@ AquaHideout_1F_MapScripts:: @ 8233493
AquaHideout_1F_EventScript_233494:: @ 8233494
lock
faceplayer
goto_if_set FLAG_0x06F, AquaHideout_1F_EventScript_2334BC
goto_if_set FLAG_0x0D4, AquaHideout_1F_EventScript_2334B2
goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_2334BC
goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_2334B2
msgbox AquaHideout_1F_Text_23351D, MSGBOX_DEFAULT
release
end
@ -23,8 +23,8 @@ AquaHideout_1F_EventScript_2334BC:: @ 82334BC
AquaHideout_1F_EventScript_2334C6:: @ 82334C6
lock
faceplayer
goto_if_set FLAG_0x06F, AquaHideout_1F_EventScript_2334EE
goto_if_set FLAG_0x0D4, AquaHideout_1F_EventScript_2334E4
goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_2334EE
goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_2334E4
msgbox AquaHideout_1F_Text_233739, MSGBOX_DEFAULT
release
end

13
data/maps/AquaHideout_B1F/scripts.inc
View File

@ -15,8 +15,8 @@ AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
return
AquaHideout_B1F_MapScript1_2339D0: @ 82339D0
call_if_unset FLAG_0x1C4, AquaHideout_B1F_EventScript_2339E3
call_if_unset FLAG_0x1C5, AquaHideout_B1F_EventScript_2339E7
call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E3
call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E7
end
AquaHideout_B1F_EventScript_2339E3:: @ 82339E3
@ -45,12 +45,12 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
goto_if_eq AquaHideout_B1F_EventScript_233A2F
compare VAR_RESULT, 5
goto_if_eq AquaHideout_B1F_EventScript_233A2F
setflag FLAG_0x1C4
setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT
release
end
AquaHideout_B1F_EventScript_233A2F:: @ 8233A2F
setflag FLAG_0x1C4
setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT
goto AquaHideout_B1F_EventScript_27376D
end
@ -72,12 +72,12 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38
goto_if_eq AquaHideout_B1F_EventScript_233A7C
compare VAR_RESULT, 5
goto_if_eq AquaHideout_B1F_EventScript_233A7C
setflag FLAG_0x1C5
setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT
release
end
AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C
setflag FLAG_0x1C5
setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT
goto AquaHideout_B1F_EventScript_27376D
end
@ -165,4 +165,3 @@ AquaHideout_B1F_Text_233D6E: @ 8233D6E
AquaHideout_B1F_Text_233D84: @ 8233D84
.string "If you have a cool uniform, you look\n"
.string "good even in a loss, don't you think?$"

5
data/maps/AquaHideout_B2F/scripts.inc
View File

@ -3,7 +3,7 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF
.byte 0
AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5
call_if_set FLAG_0x070, AquaHideout_B2F_EventScript_233DDF
call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_233DDF
end
AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF
@ -46,7 +46,7 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25
applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E
waitmovement 0
msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT
setflag FLAG_0x070
setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE
setflag FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
release
end
@ -156,4 +156,3 @@ AquaHideout_B2F_Text_2342CC: @ 82342CC
AquaHideout_B2F_Text_2342FF: @ 82342FF
.string "I'll have to learn about how I can\n"
.string "battle more effectively…$"

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

@ -3,6 +3,6 @@ ArtisanCave_B1F_MapScripts:: @ 823AFAD
.byte 0
ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3
setflag FLAG_0x8DF
setflag FLAG_LANDMARK_ARTISAN_CAVE
end

4
data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
View File

@ -5,8 +5,8 @@ BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC
object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4

4
data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
View File

@ -11,9 +11,9 @@ BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 15, EVENT_OBJ_GFX_VAR_0, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0

4
data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
View File

@ -1,12 +1,12 @@
BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 8, 255, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_VAR_F, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0

4
data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
View File

@ -1,6 +1,6 @@
BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0

4
data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
View File

@ -1,6 +1,6 @@
BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2

2
data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
View File

@ -1,5 +1,5 @@
BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0

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

@ -513,7 +513,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC:: @ 82421FC
end
BattleFrontier_BattleTowerBattleRoom_EventScript_24220E:: @ 824220E
setflag FLAG_0x077
setflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE
goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03
end

8
data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
View File

@ -1,10 +1,10 @@
BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 5, 255, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 6, 254, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 5, EVENT_OBJ_GFX_VAR_F, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_VAR_E, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054
map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0

4
data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
View File

@ -1,8 +1,8 @@
BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50
object_event 1, 255, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 4, 254, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_VAR_E, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0
map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0

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

@ -40,7 +40,7 @@ BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55
return
BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F
goto_if_unset FLAG_0x152, BattleFrontier_BattleTowerElevator_EventScript_241A7C
goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_241A7C
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2
waitstate
return

2
data/maps/BattleFrontier_BattleTowerLobby/events.inc
View File

@ -4,7 +4,7 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638
object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0
object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0
object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, FLAG_HIDE_BATTLE_TOWER_REPORTER
object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE
object_event 6, EVENT_OBJ_GFX_VAR_0, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE
object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0
object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0
object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0

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

@ -15,7 +15,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694
special CallApprenticeFunction
compare VAR_0x8004, 0
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5
goto_if_set FLAG_0x934, BattleFrontier_BattleTowerLobby_EventScript_23E6C1
goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_23E6C1
BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5
clearflag FLAG_HIDE_APPRENTICE
@ -120,7 +120,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2
BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2
compare VAR_FRONTIER_BATTLE_MODE, 2
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E
goto_if_set FLAG_0x152, BattleFrontier_BattleTowerLobby_EventScript_23E81E
goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_23E81E
setvar VAR_0x8004, 1
setvar VAR_0x8005, 1
special sub_8161F74
@ -398,7 +398,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08
lock
faceplayer
setvar VAR_FRONTIER_FACILITY, 0
clearflag FLAG_0x152
clearflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER
special SavePlayerParty
msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, MSGBOX_DEFAULT
@ -744,7 +744,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108
compare VAR_RESULT, 6
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23F108
call BattleFrontier_BattleTowerLobby_EventScript_23F135
clearflag FLAG_0x077
clearflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6
setvar VAR_TEMP_0, 0
waitstate

16
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
View File

@ -1,13 +1,13 @@
BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4
object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5
object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
object_event 8, 246, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
object_event 9, 247, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4
object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5
object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C
map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0

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

@ -11,7 +11,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
end
BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA
goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA
clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
@ -165,7 +165,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29
end
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3
setvar VAR_0x8004, 11
setvar VAR_0x8005, 0
special sub_8161F74
@ -195,7 +195,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
compare VAR_FACING, 1
call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF
removeobject VAR_LAST_TALKED
setflag FLAG_0x152
setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER
warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3
waitstate
release

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

@ -4,9 +4,9 @@ BattleFrontier_Lounge1_MapScripts:: @ 825E774
BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775
lock
faceplayer
call_if_unset FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7AD
call_if_set FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7B6
setflag FLAG_0x153
call_if_unset FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_25E7AD
call_if_set FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_25E7B6
setflag FLAG_MET_BATTLE_FRONTIER_BREEDER
goto BattleFrontier_Lounge1_EventScript_25E792
end

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

@ -4,8 +4,8 @@ BattleFrontier_Lounge2_MapScripts:: @ 8260642
BattleFrontier_Lounge2_EventScript_260643:: @ 8260643
lock
faceplayer
goto_if_set FLAG_0x154, BattleFrontier_Lounge2_EventScript_26065F
setflag FLAG_0x154
goto_if_set FLAG_MET_BATTLE_FRONTIER_MANIAC, BattleFrontier_Lounge2_EventScript_26065F
setflag FLAG_MET_BATTLE_FRONTIER_MANIAC
msgbox BattleFrontier_Lounge2_Text_260766, MSGBOX_DEFAULT
goto BattleFrontier_Lounge2_EventScript_26066D
end

5
data/maps/BattleFrontier_Lounge3/scripts.inc
View File

@ -4,11 +4,11 @@ BattleFrontier_Lounge3_MapScripts:: @ 8261D82
BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83
lock
faceplayer
goto_if_set FLAG_0x157, BattleFrontier_Lounge3_EventScript_261EF9
goto_if_set FLAG_MET_BATTLE_FRONTIER_BETTOR, BattleFrontier_Lounge3_EventScript_261EF9
call BattleFrontier_Lounge3_EventScript_261EA0
compare VAR_0x8004, 2
goto_if_le BattleFrontier_Lounge3_EventScript_261EEB
setflag FLAG_0x157
setflag FLAG_MET_BATTLE_FRONTIER_BETTOR
msgbox BattleFrontier_Lounge3_Text_262061, MSGBOX_DEFAULT
goto BattleFrontier_Lounge3_EventScript_261DAF
end
@ -472,4 +472,3 @@ BattleFrontier_Lounge3_Text_263545:: @ 8263545
.string "Those TRAINERS…\n"
.string "What are they doing?\l"
.string "They should be taking challenges.$"

13
data/maps/BattleFrontier_Lounge6/scripts.inc
View File

@ -4,10 +4,10 @@ BattleFrontier_Lounge6_MapScripts:: @ 8264FEC
BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
lock
faceplayer
goto_if_set FLAG_0x09C, BattleFrontier_Lounge6_EventScript_265083
goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083
setvar VAR_0x8008, 3
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO
compare VAR_RESULT, 0
@ -18,17 +18,17 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
compare VAR_0x8004, 255
goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if_ne BattleFrontier_Lounge6_EventScript_265075
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10
special sub_807F0E4
special CreateInGameTradePokemon
special DoInGameTradeScene
waitstate
msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT
setflag FLAG_0x09C
setflag FLAG_BATTLE_FRONTIER_TRADE_DONE
release
end
@ -78,4 +78,3 @@ BattleFrontier_Lounge6_Text_26520E: @ 826520E
.string "Giggle!\n"
.string "A SKITTY is so much cuter than I had\l"
.string "imagined. I'm delighted!$"

9
data/maps/BattleFrontier_Lounge7/scripts.inc
View File

@ -5,9 +5,9 @@ BattleFrontier_Lounge7_EventScript_265255:: @ 8265255
lock
faceplayer
setvar VAR_TEMP_C, 9
goto_if_set FLAG_0x15A, BattleFrontier_Lounge7_EventScript_265276
goto_if_set FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_265276
msgbox BattleFrontier_Lounge7_Text_2656ED, MSGBOX_DEFAULT
setflag FLAG_0x15A
setflag FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR
goto BattleFrontier_Lounge7_EventScript_265284
end
@ -119,9 +119,9 @@ BattleFrontier_Lounge7_EventScript_265445:: @ 8265445
lock
faceplayer
setvar VAR_TEMP_C, 10
goto_if_set FLAG_0x15B, BattleFrontier_Lounge7_EventScript_265466
goto_if_set FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_265466
msgbox BattleFrontier_Lounge7_Text_265A6C, MSGBOX_DEFAULT
setflag FLAG_0x15B
setflag FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR
goto BattleFrontier_Lounge7_EventScript_265474
end
@ -477,4 +477,3 @@ BattleFrontier_Lounge7_Text_2661B5:: @ 82661B5
.string "A fiery punch\n"
.string "that may burn\n"
.string "the foe.$"

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

@ -17,7 +17,7 @@ BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19
BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D
setvar VAR_0x40BC, 0
setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
call_if_unset FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242C3F
call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242C3F
end
BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F
@ -139,12 +139,12 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
compare VAR_RESULT, 5
goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60
setflag FLAG_0x1C6
setflag FLAG_DEFEATED_SUDOWOODO
release
end
BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60
setflag FLAG_0x1C6
setflag FLAG_DEFEATED_SUDOWOODO
goto IslandCave_EventScript_27376D
end
@ -221,7 +221,7 @@ BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0
BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9
lock
faceplayer
goto_if_set FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242DFE
goto_if_set FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242DFE
msgbox BattleFrontier_OutsideEast_Text_243C2C, MSGBOX_DEFAULT
release
end

20
data/maps/BattleFrontier_ScottsHouse/scripts.inc
View File

@ -11,15 +11,15 @@ BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8
end
BattleFrontier_ScottsHouse_EventScript_2636CB:: @ 82636CB
goto_if_unset FLAG_0x1D1, BattleFrontier_ScottsHouse_EventScript_263943
goto_if_unset FLAG_0x05C, BattleFrontier_ScottsHouse_EventScript_263704
goto_if_unset FLAG_0x1D2, BattleFrontier_ScottsHouse_EventScript_26376A
goto_if_unset FLAG_SCOTT_GIVES_BATTLE_POINTS, BattleFrontier_ScottsHouse_EventScript_263943
goto_if_unset FLAG_COLLECTED_ALL_SILVER_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_263704
goto_if_unset FLAG_RECEIVED_STARF_BERRY_FROM_SCOTT, BattleFrontier_ScottsHouse_EventScript_26376A
goto BattleFrontier_ScottsHouse_EventScript_2636EC
end
BattleFrontier_ScottsHouse_EventScript_2636EC:: @ 82636EC
goto_if_unset FLAG_0x0ED, BattleFrontier_ScottsHouse_EventScript_26381B
goto_if_unset FLAG_0x0EE, BattleFrontier_ScottsHouse_EventScript_2638B4
goto_if_unset FLAG_RECEIVED_SILVER_SHIELD, BattleFrontier_ScottsHouse_EventScript_26381B
goto_if_unset FLAG_RECEIVED_GOLD_SHIELD, BattleFrontier_ScottsHouse_EventScript_2638B4
goto BattleFrontier_ScottsHouse_EventScript_2637E4
end
@ -35,7 +35,7 @@ BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704
giveitem_std ITEM_LANSAT_BERRY
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0
setflag FLAG_0x05C
setflag FLAG_COLLECTED_ALL_SILVER_SYMBOLS
setflag FLAG_TEMP_4
release
end
@ -52,7 +52,7 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A
giveitem_std ITEM_STARF_BERRY
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0
setflag FLAG_0x1D2
setflag FLAG_RECEIVED_STARF_BERRY_FROM_SCOTT
setflag FLAG_TEMP_4
release
end
@ -115,7 +115,7 @@ BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A
givedecoration_std 42
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
setflag FLAG_0x0ED
setflag FLAG_RECEIVED_SILVER_SHIELD
setflag FLAG_TEMP_3
goto BattleFrontier_ScottsHouse_EventScript_2638AA
end
@ -158,7 +158,7 @@ BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913
givedecoration_std 43
compare VAR_RESULT, 0
goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0
setflag FLAG_0x0EE
setflag FLAG_RECEIVED_GOLD_SHIELD
setflag FLAG_TEMP_3
goto BattleFrontier_ScottsHouse_EventScript_2638AA
end
@ -221,7 +221,7 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
special sub_813A9D0
msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9
msgbox BattleFrontier_ScottsHouse_Text_263CD0, MSGBOX_DEFAULT
setflag FLAG_0x1D1
setflag FLAG_SCOTT_GIVES_BATTLE_POINTS
setflag FLAG_TEMP_2
release
end

21
data/maps/BirthIsland_Exterior/scripts.inc
View File

@ -9,12 +9,12 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25
end
BirthIsland_Exterior_MapScript1_267F29: @ 8267F29
setflag FLAG_0x8D3
setflag FLAG_MAP_SCRIPT_CHECKED_DEOXYS
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_0x4034, 0
setvar VAR_0x4035, 0
call_if_set FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F4E
call_if_unset FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F55
setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0
setvar VAR_DEOXYS_ROCK_LEVEL, 0
call_if_set FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_267F4E
call_if_unset FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_267F55
end
BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
@ -23,9 +23,9 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E
return
BirthIsland_Exterior_EventScript_267F55:: @ 8267F55
goto_if_set FLAG_0x1AC, BirthIsland_Exterior_EventScript_27374E
goto_if_set FLAG_DEFEATED_DEOXYS, BirthIsland_Exterior_EventScript_27374E
clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
clearflag FLAG_0x8D4
clearflag FLAG_DEOXYS_ROCK_COMPLETE
return
BirthIsland_Exterior_MapScript1_267F65: @ 8267F65
@ -42,7 +42,7 @@ BirthIsland_Exterior_EventScript_267F6F:: @ 8267F6F
BirthIsland_Exterior_EventScript_267F83:: @ 8267F83
lock
faceplayer
special sub_813AFC8
special DoDeoxysRockInteraction
waitstate
switch VAR_RESULT
case 0, BirthIsland_Exterior_EventScript_267FBB
@ -94,12 +94,12 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1
goto_if_eq BirthIsland_Exterior_EventScript_268049
compare VAR_RESULT, 5
goto_if_eq BirthIsland_Exterior_EventScript_268049
setflag FLAG_0x1AD
setflag FLAG_BATTLED_DEOXYS
release
end
BirthIsland_Exterior_EventScript_26803B:: @ 826803B
setflag FLAG_0x1AC
setflag FLAG_DEFEATED_DEOXYS
setvar VAR_0x8004, 410
goto BirthIsland_Exterior_EventScript_273776
end
@ -118,4 +118,3 @@ BirthIsland_Exterior_Movement_268054: @ 8268054
walk_slow_down
walk_slow_down
step_end

3
data/maps/CaveOfOrigin_1F/scripts.inc
View File

@ -3,6 +3,5 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768
.byte 0
CaveOfOrigin_1F_MapScript1_23576E: @ 823576E
call_if_set FLAG_0x071, CaveOfOrigin_1F_EventScript_2722C1
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_1F_EventScript_2722C1
end

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

@ -51,7 +51,7 @@ CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D
closemessage
playse SE_KAIDAN
fadescreenspeed 1, 4
setflag FLAG_0x137
setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR
setvar VAR_0x405E, 3
removeobject 1
clearflag FLAG_HIDE_SKY_PILLAR_WALLACE

3
data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
View File

@ -3,6 +3,5 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778
.byte 0
CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E
call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1
end

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

@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
.byte 0
CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E
call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1
end

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

@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
.byte 0
CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E
call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1
call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1
end

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

@ -30,7 +30,7 @@ DesertRuins_EventScript_22D993:: @ 822D993
DesertRuins_MapScript1_22D9CA: @ 822D9CA
setflag FLAG_LANDMARK_DESERT_RUINS
call_if_unset FLAG_0x1BB, DesertRuins_EventScript_22D9D7
call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_22D9D7
end
DesertRuins_EventScript_22D9D7:: @ 822D9D7
@ -78,12 +78,12 @@ DesertRuins_EventScript_22DA02:: @ 822DA02
goto_if_eq DesertRuins_EventScript_22DA52
compare VAR_RESULT, 5
goto_if_eq DesertRuins_EventScript_22DA52
setflag FLAG_0x1BB
setflag FLAG_DEFEATED_REGIROCK
release
end
DesertRuins_EventScript_22DA49:: @ 822DA49
setflag FLAG_0x1BB
setflag FLAG_DEFEATED_REGIROCK
goto DesertRuins_EventScript_27376D
end

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

@ -9,8 +9,8 @@ DesertUnderpass_MapScript1_23AF3D: @ 823AF3D
DesertUnderpass_EventScript_23AF41:: @ 823AF41
lock
faceplayer
goto_if_set FLAG_0x14F, DesertUnderpass_EventScript_23AF57
goto_if_set FLAG_0x150, DesertUnderpass_EventScript_23AF68
goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_23AF57
goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_23AF68
release
end

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

@ -9,7 +9,7 @@ DewfordTown_MapScript1_1E950D: @ 81E950D
DewfordTown_EventScript_1E9511:: @ 81E9511
lock
faceplayer
goto_if_unset FLAG_0x0BD, DewfordTown_EventScript_1E9585
goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_1E9585
message DewfordTown_Text_1E9C8A
waitmessage
multichoicedefault 21, 6, 0, 2, 0
@ -73,7 +73,7 @@ DewfordTown_EventScript_1E95CC:: @ 81E95CC
DewfordTown_EventScript_1E95D5:: @ 81E95D5
lock
faceplayer
goto_if_set FLAG_0x101, DewfordTown_EventScript_1E962A
goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_1E962A
msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO
compare VAR_RESULT, 1
goto_if_eq DewfordTown_EventScript_1E95FF
@ -84,7 +84,7 @@ DewfordTown_EventScript_1E95D5:: @ 81E95D5
DewfordTown_EventScript_1E95FF:: @ 81E95FF
msgbox DewfordTown_Text_1E9E14, MSGBOX_DEFAULT
giveitem_std ITEM_OLD_ROD
setflag FLAG_0x101
setflag FLAG_RECEIVED_OLD_ROD
msgbox DewfordTown_Text_1E9E65, MSGBOX_DEFAULT
release
end
@ -174,8 +174,8 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7
clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
hideobjectat 4, MAP_DEWFORD_TOWN
call_if_unset FLAG_0x095, DewfordTown_EventScript_1E9790
call_if_set FLAG_0x095, DewfordTown_EventScript_1E9799
call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9790
call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9799
closemessage
copyvar VAR_0x4096, VAR_0x8008
resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN

15
data/maps/DewfordTown_Gym/scripts.inc
View File

@ -160,7 +160,7 @@ DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq DewfordTown_Gym_EventScript_1FC89C
goto_if_unset FLAG_0x0A6, DewfordTown_Gym_EventScript_1FC878
goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1FC878
msgbox DewfordTown_Gym_Text_1FD20D, MSGBOX_DEFAULT
release
end
@ -171,7 +171,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
waitmessage
call DewfordTown_Gym_EventScript_27207E
msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT
setflag FLAG_0x4F1
setflag FLAG_DEFEATED_DEWFORD_GYM
setflag FLAG_BADGE02_GET
addvar VAR_0x4085, 1
compare VAR_0x4085, 6
@ -186,9 +186,9 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7
waitfanfare
closemessage
delay 30
setflag FLAG_0x1D4
setflag FLAG_ENABLE_BRAWLY_MATCH_CALL
setvar VAR_0x40F4, 0
setflag FLAG_0x080
setflag FLAG_ENABLE_ROXANNE_FIRST_CALL
release
end
@ -197,7 +197,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855
compare VAR_RESULT, 0
goto_if_eq DewfordTown_Gym_EventScript_27205E
msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
setflag FLAG_0x0A6
setflag FLAG_RECEIVED_TM08
return
DewfordTown_Gym_EventScript_1FC878:: @ 81FC878
@ -205,7 +205,7 @@ DewfordTown_Gym_EventScript_1FC878:: @ 81FC878
compare VAR_RESULT, 0
goto_if_eq DewfordTown_Gym_EventScript_272054
msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT
setflag FLAG_0x0A6
setflag FLAG_RECEIVED_TM08
release
end
@ -277,7 +277,7 @@ DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C
DewfordTown_Gym_EventScript_1FC983:: @ 81FC983
lock
faceplayer
goto_if_set FLAG_0x4F1, DewfordTown_Gym_EventScript_1FC998
goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_1FC998
msgbox DewfordTown_Gym_Text_1FC9D6, MSGBOX_DEFAULT
release
end
@ -484,4 +484,3 @@ DewfordTown_Gym_Text_1FD3DE: @ 81FD3DE
.string "that can battle.\p"
.string "I'm sorry, but I'd like you to come back\n"
.string "with at least two POKéMON.$"

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

@ -252,12 +252,12 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA
lock
faceplayer
call DewfordTown_Hall_EventScript_271E8B
goto_if_set FLAG_RECEIVED_TM_36, DewfordTown_Hall_EventScript_1FD80E
goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1FD80E
msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT
giveitem_std ITEM_TM36
compare VAR_RESULT, 0
goto_if_eq DewfordTown_Hall_EventScript_272054
setflag FLAG_RECEIVED_TM_36
setflag FLAG_RECEIVED_TM36
release
end

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

@ -4,12 +4,12 @@ DewfordTown_House2_MapScripts:: @ 81FE22D
DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E
lock
faceplayer
goto_if_set FLAG_0x121, DewfordTown_House2_EventScript_1FE267
goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_1FE267
msgbox DewfordTown_House2_Text_1FE27A, MSGBOX_DEFAULT
giveitem_std ITEM_SILK_SCARF
compare VAR_RESULT, 0
goto_if_eq DewfordTown_House2_EventScript_1FE25D
setflag FLAG_0x121
setflag FLAG_RECEIVED_SILK_SCARF
release
end

2
data/maps/EverGrandeCity_ChampionsRoom/events.inc
View File

@ -1,6 +1,6 @@
EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700
object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_RIVAL
object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_RIVAL
object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_BIRCH
EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748

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

@ -24,7 +24,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5
end
EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2
call_if_set FLAG_0x4FE, EverGrandeCity_DrakesRoom_EventScript_2286E7
call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_2286E7
compare VAR_0x409C, 4
call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED
end
@ -40,7 +40,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286ED:: @ 82286ED
EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3
lock
faceplayer
goto_if_set FLAG_0x4FE, EverGrandeCity_DrakesRoom_EventScript_22871A
goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_22871A
playbgm MUS_SITENNOU, 0
msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895
@ -55,7 +55,7 @@ EverGrandeCity_DrakesRoom_EventScript_22871A:: @ 822871A
EverGrandeCity_DrakesRoom_EventScript_228724:: @ 8228724
setvar VAR_0x8004, 0
special sub_813BF7C
setflag FLAG_0x4FE
setflag FLAG_DEFEATED_ELITE_4_DRAKE
call EverGrandeCity_DrakesRoom_EventScript_2723F8
msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT
release

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

@ -24,7 +24,7 @@ EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B
end
EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448
call_if_set FLAG_0x4FD, EverGrandeCity_GlaciasRoom_EventScript_22845D
call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_22845D
compare VAR_0x409C, 3
call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463
end
@ -40,7 +40,7 @@ EverGrandeCity_GlaciasRoom_EventScript_228463:: @ 8228463
EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469
lock
faceplayer
goto_if_set FLAG_0x4FD, EverGrandeCity_GlaciasRoom_EventScript_228490
goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_228490
playbgm MUS_SITENNOU, 0
msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4
@ -53,7 +53,7 @@ EverGrandeCity_GlaciasRoom_EventScript_228490:: @ 8228490
end
EverGrandeCity_GlaciasRoom_EventScript_22849A:: @ 822849A
setflag FLAG_0x4FD
setflag FLAG_DEFEATED_ELITE_4_GLACIA
call EverGrandeCity_GlaciasRoom_EventScript_2723F8
msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT
release

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

@ -24,7 +24,7 @@ EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D
end
EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA
call_if_set FLAG_0x4FC, EverGrandeCity_PhoebesRoom_EventScript_2281BF
call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281BF
compare VAR_0x409C, 2
call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5
end
@ -40,7 +40,7 @@ EverGrandeCity_PhoebesRoom_EventScript_2281C5:: @ 82281C5
EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB
lock
faceplayer
goto_if_set FLAG_0x4FC, EverGrandeCity_PhoebesRoom_EventScript_2281F2
goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281F2
playbgm MUS_SITENNOU, 0
msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_228325
@ -53,7 +53,7 @@ EverGrandeCity_PhoebesRoom_EventScript_2281F2:: @ 82281F2
end
EverGrandeCity_PhoebesRoom_EventScript_2281FC:: @ 82281FC
setflag FLAG_0x4FC
setflag FLAG_DEFEATED_ELITE_4_PHOEBE
call EverGrandeCity_PhoebesRoom_EventScript_2723F8
msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT
release

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

@ -5,7 +5,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1
call_if_unset FLAG_0x1CF, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C
end
EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C
@ -41,7 +41,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79
compare VAR_FACING, 3
call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
addvar VAR_0x40D1, 1
setflag FLAG_0x1CF
setflag FLAG_MET_SCOTT_IN_EVERGRANDE
playse SE_KAIDAN
waitse
removeobject 4

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

@ -6,7 +6,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD
setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
setflag FLAG_LANDMARK_POKEMON_LEAGUE
call_if_unset FLAG_0x107, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED
end
EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED
@ -62,7 +62,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636
special LoadPlayerParty
lockall
goto_if_set FLAG_0x107, EverGrandeCity_PokemonLeague_1F_EventScript_2296BB
goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2296BB
getplayerxy VAR_TEMP_0, VAR_TEMP_1
compare VAR_TEMP_0, 11
call_if_ge EverGrandeCity_PokemonLeague_1F_EventScript_229698
@ -84,7 +84,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636
closemessage
moveobjectoffscreen 3
moveobjectoffscreen 4
setflag FLAG_0x107
setflag FLAG_ENTERED_ELITE_FOUR
releaseall
end

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

@ -6,12 +6,12 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01
.byte 0
EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16
setflag FLAG_0x1CF
setflag FLAG_MET_SCOTT_IN_EVERGRANDE
setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
end
EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D
call_if_set FLAG_0x4FB, EverGrandeCity_SidneysRoom_EventScript_227F32
call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32
compare VAR_0x409C, 1
call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38
end
@ -47,7 +47,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57
EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64
lock
faceplayer
goto_if_set FLAG_0x4FB, EverGrandeCity_SidneysRoom_EventScript_227F8B
goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B
playbgm MUS_SITENNOU, 0
msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2
@ -60,7 +60,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B
end
EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95
setflag FLAG_0x4FB
setflag FLAG_DEFEATED_ELITE_4_SYDNEY
call EverGrandeCity_SidneysRoom_EventScript_2723F8
msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT
release

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

@ -5,13 +5,13 @@ FallarborTown_MapScripts:: @ 81EB1FA
FallarborTown_MapScript1_1EB200: @ 81EB200
setflag FLAG_VISITED_FALLARBOR_TOWN
setvar VAR_0x4086, 0
clearflag FLAG_0x10E
clearflag FLAG_CONTEST_SKETCH_CREATED
end
FallarborTown_EventScript_1EB20C:: @ 81EB20C
lock
faceplayer
goto_if_set FLAG_0x08B, FallarborTown_EventScript_1EB221
goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_1EB221
msgbox FallarborTown_Text_1EB26B, MSGBOX_DEFAULT
release
end

4
data/maps/FallarborTown_BattleTentBattleRoom/events.inc
View File

@ -1,7 +1,7 @@
FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444
object_event 1, EVENT_OBJ_GFX_TRADER, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C
map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0

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

@ -294,10 +294,10 @@ FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F
FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228
lock
faceplayer
goto_if_set FLAG_0x1CD, FallarborTown_BattleTentLobby_EventScript_200245
goto_if_set FLAG_MET_SCOTT_IN_FALLARBOR, FallarborTown_BattleTentLobby_EventScript_200245
msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT
addvar VAR_0x40D1, 1
setflag FLAG_0x1CD
setflag FLAG_MET_SCOTT_IN_FALLARBOR
release
end

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

@ -4,7 +4,7 @@ FallarborTown_House1_MapScripts:: @ 8200F12
FallarborTown_House1_EventScript_200F13:: @ 8200F13
lock
faceplayer
goto_if_set FLAG_0x0E5, FallarborTown_House1_EventScript_200FB2
goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_200FB2
checkitem ITEM_METEORITE, 1
compare VAR_RESULT, 1
goto_if_eq FallarborTown_House1_EventScript_200F38
@ -23,7 +23,7 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38
goto_if_eq FallarborTown_House1_EventScript_272054
setvar VAR_0x8004, 280
call FallarborTown_House1_EventScript_2723E4
setflag FLAG_0x0E5
setflag FLAG_RECEIVED_TM27
msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT
release
end
@ -51,8 +51,8 @@ FallarborTown_House1_EventScript_200FB2:: @ 8200FB2
FallarborTown_House1_EventScript_200FBC:: @ 8200FBC
lock
faceplayer
goto_if_set FLAG_0x0E5, FallarborTown_House1_EventScript_200FE4
goto_if_set FLAG_0x08B, FallarborTown_House1_EventScript_200FDA
goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_200FE4
goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_200FDA
msgbox FallarborTown_House1_Text_2012BC, MSGBOX_DEFAULT
release
end

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

@ -3,7 +3,7 @@ FarawayIsland_Entrance_MapScripts:: @ 8267C8E
.byte 0
FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94
setflag FLAG_0x8D8
setflag FLAG_ARRIVED_ON_FARAWAY_ISLAND
end
FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98

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

@ -40,11 +40,11 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E
FarawayIsland_Interior_MapScript1_267D72: @ 8267D72
setvar VAR_0x403A, 0
setvar VAR_TEMP_1, 1
call_if_unset FLAG_0x1CA, FarawayIsland_Interior_EventScript_267D86
call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86
end
FarawayIsland_Interior_EventScript_267D86:: @ 8267D86
goto_if_set FLAG_0x1C7, FarawayIsland_Interior_EventScript_27374E
goto_if_set FLAG_DEFEATED_MEW, FarawayIsland_Interior_EventScript_27374E
clearflag FLAG_HIDE_MEW
setvar VAR_TEMP_1, 0
return
@ -153,12 +153,12 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
goto_if_eq FarawayIsland_Interior_EventScript_267EA4
compare VAR_RESULT, 10
goto_if_eq FarawayIsland_Interior_EventScript_267EA4
setflag FLAG_0x1CA
setflag FLAG_CAUGHT_MEW
release
end
FarawayIsland_Interior_EventScript_267E96:: @ 8267E96
setflag FLAG_0x1C7
setflag FLAG_DEFEATED_MEW
setvar VAR_0x8004, 151
goto FarawayIsland_Interior_EventScript_273776
end

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

@ -18,7 +18,7 @@ FortreeCity_EventScript_1E25B6:: @ 81E25B6
FortreeCity_EventScript_1E25BF:: @ 81E25BF
lock
faceplayer
goto_if_set FLAG_0x127, FortreeCity_EventScript_1E25D4
goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_1E25D4
msgbox FortreeCity_Text_1E2738, MSGBOX_DEFAULT
release
end
@ -81,7 +81,7 @@ FortreeCity_EventScript_1E2645:: @ 81E2645
applymovement VAR_LAST_TALKED, FortreeCity_Movement_1E2674
waitmovement 0
removeobject VAR_LAST_TALKED
setflag FLAG_0x127
setflag FLAG_KECLEON_FLED_FORTREE
release
end

15
data/maps/FortreeCity_Gym/scripts.inc
View File

@ -20,7 +20,7 @@ FortreeCity_Gym_EventScript_2165C8:: @ 82165C8
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq FortreeCity_Gym_EventScript_21668D
goto_if_unset FLAG_0x0AA, FortreeCity_Gym_EventScript_216646
goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_216646
msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT
release
end
@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
waitmessage
call FortreeCity_Gym_EventScript_27207E
msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT
setflag FLAG_0x4F5
setflag FLAG_DEFEATED_FORTREE_GYM
setflag FLAG_BADGE06_GET
setvar VAR_0x8008, 6
call FortreeCity_Gym_EventScript_271F43
@ -42,9 +42,9 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD
waitfanfare
closemessage
delay 30
setflag FLAG_0x1D7
setflag FLAG_ENABLE_WINONA_MATCH_CALL
setvar VAR_0x40F3, 0
setflag FLAG_0x08A
setflag FLAG_REGISTER_WINONA_POKENAV
release
end
@ -53,7 +53,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646
compare VAR_RESULT, 0
goto_if_eq FortreeCity_Gym_EventScript_272054
msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
setflag FLAG_0x0AA
setflag FLAG_RECEIVED_TM40
release
end
@ -62,7 +62,7 @@ FortreeCity_Gym_EventScript_21666A:: @ 821666A
compare VAR_RESULT, 0
goto_if_eq FortreeCity_Gym_EventScript_27205E
msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT
setflag FLAG_0x0AA
setflag FLAG_RECEIVED_TM40
return
FortreeCity_Gym_EventScript_21668D:: @ 821668D
@ -103,7 +103,7 @@ FortreeCity_Gym_EventScript_21671B:: @ 821671B
FortreeCity_Gym_EventScript_216732:: @ 8216732
lock
faceplayer
goto_if_set FLAG_0x4F5, FortreeCity_Gym_EventScript_216747
goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_216747
msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT
release
end
@ -318,4 +318,3 @@ FortreeCity_Gym_Text_217292: @ 8217292
.string "POKéMON with you?\p"
.string "Please return with two POKéMON\n"
.string "at the very least.$"

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

@ -4,10 +4,10 @@ FortreeCity_House1_MapScripts:: @ 82162BA
FortreeCity_House1_EventScript_2162BB:: @ 82162BB
lock
faceplayer
goto_if_set FLAG_0x09B, FortreeCity_House1_EventScript_216355
goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355
setvar VAR_0x8008, 1
copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT
msgbox FortreeCity_House1_Text_21637B, MSGBOX_YESNO
compare VAR_RESULT, 0
@ -18,18 +18,18 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB
compare VAR_0x8004, 255
goto_if_eq FortreeCity_House1_EventScript_21633D
copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4
specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009
goto_if_ne FortreeCity_House1_EventScript_216347
copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10
special sub_807F0E4
special CreateInGameTradePokemon
special DoInGameTradeScene
waitstate
bufferspeciesname 0, VAR_0x8009
msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT
setflag FLAG_0x09B
setflag FLAG_FORTREE_NPC_TRADE_COMPLETED
release
end

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

@ -4,8 +4,8 @@ FortreeCity_House2_MapScripts:: @ 82177CA
FortreeCity_House2_EventScript_2177CB:: @ 82177CB
lock
faceplayer
goto_if_set FLAG_0x108, FortreeCity_House2_EventScript_21786E
call_if_unset FLAG_0x076, FortreeCity_House2_EventScript_217862
goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_21786E
call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_217862
msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT
multichoice 21, 8, 54, 1
switch VAR_RESULT
@ -22,14 +22,14 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB
giveitem_std ITEM_TM10
compare VAR_RESULT, 0
goto_if_eq FortreeCity_House2_EventScript_272054
setflag FLAG_0x108
setflag FLAG_RECEIVED_TM10
msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT
release
end
FortreeCity_House2_EventScript_217862:: @ 8217862
msgbox FortreeCity_House2_Text_217882, MSGBOX_DEFAULT
setflag FLAG_0x076
setflag FLAG_MET_HIDDEN_POWER_GIVER
return
FortreeCity_House2_EventScript_21786E:: @ 821786E

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

@ -7,12 +7,12 @@ FortreeCity_House4_EventScript_217C81:: @ 8217C81
FortreeCity_House4_EventScript_217C8A:: @ 8217C8A
lockall
goto_if_set FLAG_0x0DF, FortreeCity_House4_EventScript_217D06
goto_if_set FLAG_0x0E0, FortreeCity_House4_EventScript_217CD8
goto_if_set FLAG_0x0DE, FortreeCity_House4_EventScript_217CC4
goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_217D06
goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_217CD8
goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_217CC4
msgbox FortreeCity_House4_Text_217DB9, MSGBOX_DEFAULT
closemessage
setflag FLAG_0x0DE
setflag FLAG_WINGULL_SENT_ON_ERRAND
clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL
applymovement 3, FortreeCity_House4_Movement_217D1A
waitmovement 0
@ -34,7 +34,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8
giveitem_std ITEM_MENTAL_HERB
compare VAR_RESULT, 0
goto_if_eq FortreeCity_House4_EventScript_272054
setflag FLAG_0x0DF
setflag FLAG_RECEIVED_MENTAL_HERB
releaseall
end

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

@ -4,10 +4,10 @@ GraniteCave_1F_MapScripts:: @ 822DA5D
GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E
lock
faceplayer
goto_if_set FLAG_0x06D, GraniteCave_1F_EventScript_22DA8A
goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_22DA8A
msgbox GraniteCave_1F_Text_22DA94, MSGBOX_DEFAULT
giveitem_std ITEM_HM05
setflag FLAG_0x06D
setflag FLAG_RECEIVED_HM05
msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT
release
end

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

@ -7,7 +7,7 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B
msgbox GraniteCave_StevensRoom_Text_22DD5A, MSGBOX_DEFAULT
setvar VAR_0x8004, 274
call GraniteCave_StevensRoom_EventScript_2723E4
setflag FLAG_0x0BD
setflag FLAG_DELIVERED_STEVEN_LETTER
msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT
giveitem_std ITEM_TM47
compare VAR_RESULT, 0
@ -20,7 +20,7 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B
waitfanfare
closemessage
delay 30
setflag FLAG_0x131
setflag FLAG_REGISTERED_STEVEN_POKENAV
msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT
closemessage
compare VAR_FACING, 2

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

@ -31,7 +31,7 @@ IslandCave_EventScript_238E62:: @ 8238E62
IslandCave_MapScript1_238E99: @ 8238E99
setflag FLAG_LANDMARK_ISLAND_CAVE
call IslandCave_EventScript_238F45
call_if_unset FLAG_0x1BC, IslandCave_EventScript_238EAB
call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_238EAB
end
IslandCave_EventScript_238EAB:: @ 8238EAB
@ -107,12 +107,12 @@ IslandCave_EventScript_238F58:: @ 8238F58
goto_if_eq IslandCave_EventScript_238FA8
compare VAR_RESULT, 5
goto_if_eq IslandCave_EventScript_238FA8
setflag FLAG_0x1BC
setflag FLAG_DEFEATED_REGICE
release
end
IslandCave_EventScript_238F9F:: @ 8238F9F
setflag FLAG_0x1BC
setflag FLAG_DEFEATED_REGICE
goto IslandCave_EventScript_27376D
end

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

@ -68,7 +68,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB
JaggedPass_EventScript_230718:: @ 8230718
lockall
goto_if_set FLAG_0x139, JaggedPass_EventScript_230766
goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766
waitse
playse SE_PIN
applymovement 5, JaggedPass_Movement_272598
@ -80,7 +80,7 @@ JaggedPass_EventScript_230718:: @ 8230718
msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT
closemessage
trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D
setflag FLAG_0x139
setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS
applymovement 5, JaggedPass_Movement_2725A2
waitmovement 0
releaseall

4
data/maps/LavaridgeTown/events.inc
View File

@ -5,8 +5,8 @@ LavaridgeTown_EventObjects: @ 8527A54
object_event 4, EVENT_OBJ_GFX_TWIN, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_1EA720, 0
object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0
object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0
object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2
object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
object_event 7, EVENT_OBJ_GFX_VAR_3, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2
object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
object_event 9, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0
LavaridgeTown_MapWarps: @ 8527B2C

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

@ -5,8 +5,8 @@ LavaridgeTown_MapScripts:: @ 81EA4D3
LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE
setflag FLAG_VISITED_LAVARIDGE_TOWN
call_if_set FLAG_0x06C, LavaridgeTown_EventScript_1EA514
call_if_set FLAG_0x08B, LavaridgeTown_EventScript_1EA53F
call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514
call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F
call LavaridgeTown_EventScript_271ED7
call LavaridgeTown_EventScript_271EFB
compare VAR_0x4053, 1
@ -16,7 +16,7 @@ LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE
end
LavaridgeTown_EventScript_1EA514:: @ 81EA514
clearflag FLAG_0x06C
clearflag FLAG_FLANNERY_GIVES_BADGE_INFO
return
LavaridgeTown_EventScript_1EA518:: @ 81EA518
@ -71,7 +71,7 @@ LavaridgeTown_EventScript_1EA551:: @ 81EA551
LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5
msgbox LavaridgeTown_Text_1EA7C0, MSGBOX_DEFAULT
giveitem_std ITEM_GO_GOGGLES
setflag FLAG_0x0DD
setflag FLAG_RECEIVED_GO_GOGGLES
msgbox LavaridgeTown_Text_1EA897, MSGBOX_DEFAULT
goto LavaridgeTown_EventScript_1EA5FF
end
@ -79,7 +79,7 @@ LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5
LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA
msgbox LavaridgeTown_Text_1EA9A2, MSGBOX_DEFAULT
giveitem_std ITEM_GO_GOGGLES
setflag FLAG_0x0DD
setflag FLAG_RECEIVED_GO_GOGGLES
msgbox LavaridgeTown_Text_1EAA2E, MSGBOX_DEFAULT
goto LavaridgeTown_EventScript_1EA5FF
end
@ -246,7 +246,7 @@ LavaridgeTown_EventScript_1EA73B:: @ 81EA73B
LavaridgeTown_EventScript_1EA744:: @ 81EA744
lock
faceplayer
goto_if_set FLAG_0x10A, LavaridgeTown_EventScript_1EA787
goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_1EA787
msgbox LavaridgeTown_Text_1EAB80, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LavaridgeTown_EventScript_1EA79B
@ -254,7 +254,7 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744
compare VAR_RESULT, 6
goto_if_eq LavaridgeTown_EventScript_1EA791
msgbox LavaridgeTown_Text_1EACC0, MSGBOX_DEFAULT
setflag FLAG_0x10A
setflag FLAG_RECEIVED_LAVARIDGE_EGG
playfanfare MUS_FANFA4
message LavaridgeTown_Text_1EACF4
waitfanfare

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

@ -63,7 +63,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C
specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, 1
goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE864
goto_if_unset FLAG_0x0A8, LavaridgeTown_Gym_1F_EventScript_1FE81D
goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1FE81D
msgbox LavaridgeTown_Gym_1F_Text_1FF546, MSGBOX_DEFAULT
release
end
@ -73,8 +73,8 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
waitmessage
call LavaridgeTown_Gym_1F_EventScript_27207E
msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT
setflag FLAG_0x06C
setflag FLAG_0x4F3
setflag FLAG_FLANNERY_GIVES_BADGE_INFO
setflag FLAG_DEFEATED_LAVARIDGE_GYM
setflag FLAG_BADGE04_GET
addvar VAR_0x4085, 1
compare VAR_0x4085, 6
@ -91,7 +91,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1
waitfanfare
closemessage
delay 30
setflag FLAG_0x1D6
setflag FLAG_ENABLE_FLANNERY_MATCH_CALL
release
end
@ -100,7 +100,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D
compare VAR_RESULT, 0
goto_if_eq LavaridgeTown_Gym_1F_EventScript_272054
msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
setflag FLAG_0x0A8
setflag FLAG_RECEIVED_TM50
release
end
@ -109,7 +109,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841
compare VAR_RESULT, 0
goto_if_eq LavaridgeTown_Gym_1F_EventScript_27205E
msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT
setflag FLAG_0x0A8
setflag FLAG_RECEIVED_TM50
return
LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864
@ -169,7 +169,7 @@ LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951
LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C
lock
faceplayer
goto_if_set FLAG_0x4F3, LavaridgeTown_Gym_1F_EventScript_1FE981
goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_1FE981
msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, MSGBOX_DEFAULT
release
end

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

@ -28,12 +28,12 @@ LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC
LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505
lock
faceplayer
goto_if_set FLAG_0x0FE, LavaridgeTown_HerbShop_EventScript_1FE534
goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_1FE534
msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT
giveitem_std ITEM_CHARCOAL
compare VAR_RESULT, 0
goto_if_eq LavaridgeTown_HerbShop_EventScript_272054
setflag FLAG_0x0FE
setflag FLFLAG_RECEIVED_CHARCOAL
release
end

2
data/maps/LilycoveCity/events.inc
View File

@ -15,7 +15,7 @@ LilycoveCity_EventObjects: @ 8526CE8
object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS
object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2BD8, 0
object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, FLAG_HIDE_LILYCOVE_CITY_RIVAL
object_event 17, EVENT_OBJ_GFX_VAR_0, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2DDE, FLAG_HIDE_LILYCOVE_CITY_RIVAL
object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 16, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E302D, 0
object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 41, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CEE, 0
object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CDD, 0

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

@ -12,7 +12,7 @@ LilycoveCity_MapScript1_1E2B47: @ 81E2B47
end
LilycoveCity_MapScript1_1E2B61: @ 81E2B61
call_if_unset FLAG_0x070, LilycoveCity_EventScript_1E2B6B
call_if_unset FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2B6B
end
LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B
@ -34,14 +34,14 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8
lock
faceplayer
dodailyevents
goto_if_set FLAG_0x92F, LilycoveCity_EventScript_1E2C18
goto_if_set FLAG_DAILY_LILYCOVE_RECEIVED_BERRY, LilycoveCity_EventScript_1E2C18
msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT
random 10
addvar VAR_RESULT, 133
giveitem_std VAR_RESULT
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_EventScript_272054
setflag FLAG_0x92F
setflag FLAG_DAILY_LILYCOVE_RECEIVED_BERRY
msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT
release
end
@ -75,7 +75,7 @@ LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A
LilycoveCity_EventScript_1E2C53:: @ 81E2C53
lock
faceplayer
goto_if_set FLAG_0x070, LilycoveCity_EventScript_1E2C68
goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2C68
msgbox LilycoveCity_Text_1E3FAB, MSGBOX_DEFAULT
release
end
@ -88,7 +88,7 @@ LilycoveCity_EventScript_1E2C68:: @ 81E2C68
LilycoveCity_EventScript_1E2C72:: @ 81E2C72
lock
faceplayer
goto_if_set FLAG_0x070, LilycoveCity_EventScript_1E2C87
goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2C87
msgbox LilycoveCity_Text_1E40AD, MSGBOX_DEFAULT
release
end
@ -195,14 +195,14 @@ LilycoveCity_EventScript_1E2D74:: @ 81E2D74
LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D
lockall
goto_if_set FLAG_0x0DA, LilycoveCity_EventScript_1E2DB0
goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_1E2DB0
msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E
waitmovement 0
msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2
waitmovement 0
setflag FLAG_0x0DA
setflag FLAG_MET_WAILMER_TRAINER
releaseall
end
@ -239,8 +239,8 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE
LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8
playbgm MUS_GIRL_SUP, 1
call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2E48
call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2E51
call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E48
call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E51
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_EventScript_1E2E5A
msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT
@ -259,7 +259,7 @@ LilycoveCity_EventScript_1E2E51:: @ 81E2E51
return
LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A
setflag FLAG_0x11E
setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
msgbox LilycoveCity_Text_1E318D, MSGBOX_DEFAULT
savebgm MUS_DUMMY
fadedefaultbgm
@ -268,8 +268,8 @@ LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A
LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B
playbgm MUS_BOY_SUP, 1
call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2EBB
call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2EC4
call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EBB
call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EC4
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_EventScript_1E2ECD
msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT
@ -288,7 +288,7 @@ LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4
return
LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD
setflag FLAG_0x11E
setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
msgbox LilycoveCity_Text_1E36BF, MSGBOX_DEFAULT
savebgm MUS_DUMMY
fadedefaultbgm
@ -397,7 +397,7 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006
waitfieldeffect 30
savebgm MUS_DUMMY
fadedefaultbgm
setflag FLAG_0x124
setflag FLAG_MET_RIVAL_LILYCOVE
release
end

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

@ -139,23 +139,23 @@ LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6
return
LilycoveCity_ContestLobby_EventScript_21A3F3:: @ 821A3F3
setflag FLAG_0x0A0
setflag FLAG_COOL_PAINTING_MADE
return
LilycoveCity_ContestLobby_EventScript_21A3F7:: @ 821A3F7
setflag FLAG_0x0A1
setflag FLAG_BEAUTY_PAINTING_MADE
return
LilycoveCity_ContestLobby_EventScript_21A3FB:: @ 821A3FB
setflag FLAG_0x0A2
setflag FLAG_CUTE_PAINTING_MADE
return
LilycoveCity_ContestLobby_EventScript_21A3FF:: @ 821A3FF
setflag FLAG_0x0A3
setflag FLAG_SMART_PAINTING_MADE
return
LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403
setflag FLAG_0x0A4
setflag FLAG_TOUGH_PAINTING_MADE
return
LilycoveCity_ContestLobby_Movement_21A407: @ 821A407
@ -364,7 +364,7 @@ LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF
end
LilycoveCity_ContestLobby_EventScript_21A5EF:: @ 821A5EF
setflag FLAG_0x155
setflag FLAG_ENTERED_LINK_CONTEST
switch VAR_CONTEST_CATEGORY
case 0, LilycoveCity_ContestLobby_EventScript_21A62F
case 1, LilycoveCity_ContestLobby_EventScript_21A63C
@ -1004,7 +1004,7 @@ LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF
LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1
lock
faceplayer
goto_if_set FLAG_0x05F, LilycoveCity_ContestLobby_EventScript_21AD06
goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_21AD06
msgbox LilycoveCity_ContestLobby_Text_21AD10, MSGBOX_DEFAULT
release
end

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

@ -55,10 +55,10 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_218744:: @ 8218744
LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D
lock
faceplayer
goto_if_set FLAG_0x1CE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A
goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A
msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT
addvar VAR_0x40D1, 1
setflag FLAG_0x1CE
setflag FLAG_MET_SCOTT_IN_LILYCOVE
release
end

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

@ -11,11 +11,11 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
dodailyevents
compare VAR_POKELOT_PRIZE, 0
goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7
goto_if_set FLAG_0x92A, LilycoveCity_DepartmentStore_1F_EventScript_21F78D
goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_21F78D
msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797
setflag FLAG_0x92A
setflag FLAG_DAILY_PICKED_LOTO_TICKET
message LilycoveCity_DepartmentStore_1F_Text_2A64C8
waitmessage
special RetrieveLotteryNumber

23
data/maps/LilycoveCity_Harbor/scripts.inc
View File

@ -112,40 +112,40 @@ LilycoveCity_Harbor_EventScript_21E194:: @ 821E194
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_Harbor_EventScript_27374E
setvar VAR_TEMP_E, 1
goto_if_set FLAG_0x1AE, LilycoveCity_Harbor_EventScript_27374E
goto_if_set FLAG_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E
setvar VAR_TEMP_E, 2
return
LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6
setvar VAR_TEMP_D, 0
goto_if_unset FLAG_0x8D5, LilycoveCity_Harbor_EventScript_27374E
goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, LilycoveCity_Harbor_EventScript_27374E
checkitem ITEM_AURORA_TICKET, 1
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_Harbor_EventScript_27374E
setvar VAR_TEMP_D, 1
goto_if_set FLAG_0x1AF, LilycoveCity_Harbor_EventScript_27374E
goto_if_set FLAG_HAS_AURORA_TICKET, LilycoveCity_Harbor_EventScript_27374E
setvar VAR_TEMP_D, 2
return
LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8
setvar VAR_TEMP_C, 0
goto_if_unset FLAG_0x8D6, LilycoveCity_Harbor_EventScript_27374E
goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, LilycoveCity_Harbor_EventScript_27374E
checkitem ITEM_OLD_SEA_MAP, 1
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_Harbor_EventScript_27374E
setvar VAR_TEMP_C, 1
goto_if_set FLAG_0x1B0, LilycoveCity_Harbor_EventScript_27374E
goto_if_set FLAG_HAS_OLD_SEA_MAP, LilycoveCity_Harbor_EventScript_27374E
setvar VAR_TEMP_C, 2
return
LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A
setvar VAR_TEMP_9, 0
goto_if_unset FLAG_0x8E0, LilycoveCity_Harbor_EventScript_27374E
goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, LilycoveCity_Harbor_EventScript_27374E
checkitem ITEM_MYSTIC_TICKET, 1
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_Harbor_EventScript_27374E
setvar VAR_TEMP_9, 1
goto_if_set FLAG_0x1DB, LilycoveCity_Harbor_EventScript_27374E
goto_if_set FLAG_HAS_MYSTIC_TICKET, LilycoveCity_Harbor_EventScript_27374E
setvar VAR_TEMP_9, 2
return
@ -206,7 +206,7 @@ LilycoveCity_Harbor_EventScript_21E2EA:: @ 821E2EA
return
LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0
setflag FLAG_0x1AE
setflag FLAG_HAS_EON_TICKET
msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT
closemessage
call LilycoveCity_Harbor_EventScript_21E4EE
@ -223,7 +223,7 @@ LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F
end
LilycoveCity_Harbor_EventScript_21E320:: @ 821E320
setflag FLAG_0x1AF
setflag FLAG_HAS_AURORA_TICKET
msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT
closemessage
call LilycoveCity_Harbor_EventScript_21E4EE
@ -240,7 +240,7 @@ LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F
end
LilycoveCity_Harbor_EventScript_21E350:: @ 821E350
setflag FLAG_0x1B0
setflag FLAG_HAS_OLD_SEA_MAP
msgbox LilycoveCity_Harbor_Text_2A6848, MSGBOX_DEFAULT
closemessage
call LilycoveCity_Harbor_EventScript_21E4EE
@ -289,7 +289,7 @@ LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C
end
LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D
setflag FLAG_0x1DB
setflag FLAG_HAS_MYSTIC_TICKET
msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT
closemessage
call LilycoveCity_Harbor_EventScript_21E4EE
@ -617,4 +617,3 @@ LilycoveCity_Harbor_Text_21E976: @ 821E976
.string "The folks at the SHIPYARD in SLATEPORT\n"
.string "must've worked extra hard.\p"
.string "Well, it's my turn to get busy now!$"

5
data/maps/LilycoveCity_House2/scripts.inc
View File

@ -4,12 +4,12 @@ LilycoveCity_House2_MapScripts:: @ 821ED74
LilycoveCity_House2_EventScript_21ED75:: @ 821ED75
lock
faceplayer
goto_if_set FLAG_0x0EA, LilycoveCity_House2_EventScript_21EDAC
goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_21EDAC
msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT
giveitem_std ITEM_TM44
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_House2_EventScript_272054
setflag FLAG_0x0EA
setflag FLAG_RECEIVED_TM44
msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT
release
end
@ -28,4 +28,3 @@ LilycoveCity_House2_Text_21EDF9: @ 821EDF9
.string "Yawn…\p"
.string "Sleep is essential for good health…\n"
.string "Sleep and regain health…$"

24
data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
View File

@ -4,27 +4,27 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A
.byte 0
LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745
goto_if_set FLAG_0x0A0, LilycoveCity_LilycoveMuseum_2F_EventScript_21978B
goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_21978B
goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754
end
LilycoveCity_LilycoveMuseum_2F_EventScript_219754:: @ 8219754
goto_if_set FLAG_0x0A1, LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3
goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3
goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763
end
LilycoveCity_LilycoveMuseum_2F_EventScript_219763:: @ 8219763
goto_if_set FLAG_0x0A2, LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB
goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB
goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772
end
LilycoveCity_LilycoveMuseum_2F_EventScript_219772:: @ 8219772
goto_if_set FLAG_0x0A3, LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3
goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3
goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781
end
LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781
goto_if_set FLAG_0x0A4, LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB
goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB
end
LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B
@ -91,7 +91,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863
LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866
lockall
goto_if_set FLAG_0x0EC, LilycoveCity_LilycoveMuseum_2F_EventScript_219921
goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_219921
specialvar VAR_0x8004, sub_80F8940
switch VAR_0x8004
case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA
@ -121,7 +121,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA
givedecoration_std 44
compare VAR_RESULT, 0
goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911
setflag FLAG_0x0EC
setflag FLAG_RECEIVED_GLASS_ORNAMENT
closemessage
releaseall
end
@ -140,31 +140,31 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921
LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B
lockall
goto_if_set FLAG_0x0A2, LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1
goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1
msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, MSGBOX_SIGN
end
LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E
lockall
goto_if_set FLAG_0x0A4, LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD
goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD
msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, MSGBOX_SIGN
end
LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951
lockall
goto_if_set FLAG_0x0A0, LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5
goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5
msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, MSGBOX_SIGN
end
LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964
lockall
goto_if_set FLAG_0x0A1, LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3
goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3
msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, MSGBOX_SIGN
end
LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977
lockall
goto_if_set FLAG_0x0A3, LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF
goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF
msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, MSGBOX_SIGN
end

4
data/maps/LilycoveCity_PokemonCenter_1F/events.inc
View File

@ -2,8 +2,8 @@ LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC
object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0
object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0
object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0
object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0
object_event 5, EVENT_OBJ_GFX_TRADER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY
object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0
object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY
LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44
warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY

9
data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
View File

@ -110,7 +110,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA
compare VAR_RESULT, 1
goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1
clearflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
clearflag FLAG_0x0D2
clearflag FLAG_FAN_CLUB_STRENGTH_SHARED
return
LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1
@ -499,8 +499,8 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71
LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B
lock
faceplayer
goto_if_set FLAG_0x0D2, LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED
goto_if_unset FLAG_0x0D2, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90
goto_if_set FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED
goto_if_unset FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90
end
LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90
@ -594,7 +594,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8
setvar VAR_0x8004, 8
special BufferStreakTrainerText
msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, MSGBOX_DEFAULT
setflag FLAG_0x0D2
setflag FLAG_FAN_CLUB_STRENGTH_SHARED
release
end
@ -859,4 +859,3 @@ LilycoveCity_PokemonTrainerFanClub_Text_21DF51: @ 821DF51
.string "True strength is…!\n"
.string "… …\p"
.string "Actually, I have no idea, either.$"

22
data/maps/LinkContestRoom1/events.inc
View File

@ -1,18 +1,18 @@
LinkContestRoom1_EventObjects: @ 8539EFC
object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_TRADER, 0, 6, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 7, 246, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
object_event 8, 247, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
object_event 9, 248, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
object_event 10, 249, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
object_event 11, 250, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0
object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_POKE_BALL
object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
LinkContestRoom1_MapEvents:: @ 853A064

2
data/maps/LittlerootTown/events.inc
View File

@ -5,7 +5,7 @@ LittlerootTown_EventObjects: @ 85276A8
object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_TRUCK
object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_TRUCK
object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
LittlerootTown_MapWarps: @ 8527768

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

@ -9,7 +9,7 @@ LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB
call LittlerootTown_EventScript_271ED7
compare VAR_0x4092, 2
call_if_eq LittlerootTown_EventScript_1E7E67
call_if_unset FLAG_0x052, LittlerootTown_EventScript_1E7E6F
call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F
compare VAR_0x4050, 3
call_if_eq LittlerootTown_EventScript_1E7E92
compare VAR_0x4082, 4
@ -35,7 +35,7 @@ LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B
return
LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
setflag FLAG_0x12D
setflag FLAG_RIVAL_LEFT_FOR_ROUTE103
return
LittlerootTown_EventScript_1E7E53:: @ 81E7E53
@ -234,8 +234,8 @@ LittlerootTown_EventScript_1E802B:: @ 81E802B
LittlerootTown_EventScript_1E8034:: @ 81E8034
lock
faceplayer
goto_if_set FLAG_0x074, LittlerootTown_EventScript_1E8087
goto_if_set FLAG_0x052, LittlerootTown_EventScript_1E807A
goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_1E8087
goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E807A
compare VAR_0x4050, 0
goto_if_ne LittlerootTown_EventScript_1E805D
msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT
@ -918,7 +918,7 @@ LittlerootTown_EventScript_1E8693:: @ 81E8693
playfanfare MUS_FANFA4
message LittlerootTown_Text_1E8925
waitfanfare
setflag FLAG_0x112
setflag FLAG_RECEIVED_RUNNING_SHOES
msgbox LittlerootTown_Text_1E894F, MSGBOX_DEFAULT
msgbox LittlerootTown_Text_1E8A03, MSGBOX_DEFAULT
closemessage

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

@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755
LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765
compare VAR_0x4092, 6
call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A
call_if_set FLAG_0x112, LittlerootTown_BrendansHouse_1F_EventScript_1F778D
call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_1F778D
end
LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A
@ -99,7 +99,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
waitmovement 0
special GetRivalSonDaughterString
msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT
setflag FLAG_0x057
setflag FLAG_MET_RIVAL_MOM
setvar VAR_0x4082, 2
releaseall
end

24
data/maps/LittlerootTown_BrendansHouse_2F/events.inc
View File

@ -1,17 +1,17 @@
LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0
object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
object_event 8, 246, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
object_event 9, 247, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
object_event 10, 248, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
object_event 11, 249, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
object_event 12, 250, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
object_event 13, 251, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1
object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM
object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL

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

@ -15,7 +15,7 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE
end
LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A
goto_if_set FLAG_0x124, LittlerootTown_BrendansHouse_2F_EventScript_1F8433
goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F8433
compare VAR_0x4084, 2
goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F8456
goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433

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