dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Tetrable
2019-01-02 21:25:14 +00:00
parent 1e3da62d24 a0ff38d0be
commit a3ebca4d81
773 changed files with 11252 additions and 23425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis/calcrom/calcrom.pl
+9
View File
@@ -7,6 +7,7 @@ open(my $file, $ARGV[0])
my $src = 0; my $src = 0;
my $asm = 0; my $asm = 0;
my $undocumented = 0;
while (my $line = <$file>) while (my $line = <$file>)
{ {
if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/) 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; my $total = $src + $asm;
@@ -35,3 +43,4 @@ my $asmPct = sprintf("%.4f", 100 * $asm / $total);
print "$total total bytes of code\n"; print "$total total bytes of code\n";
print "$src bytes of code in src ($srcPct%)\n"; print "$src bytes of code in src ($srcPct%)\n";
print "$asm bytes of code in asm ($asmPct%)\n"; print "$asm bytes of code in asm ($asmPct%)\n";
print "$undocumented global symbols undocumented\n";
Makefile
+2 -3
View File
@@ -38,7 +38,7 @@ ASFLAGS := -mcpu=arm7tdmi
CC1 := tools/agbcc/bin/agbcc$(EXE) CC1 := tools/agbcc/bin/agbcc$(EXE)
override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm 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) LDFLAGS = -Map ../../$(MAP)
@@ -178,7 +178,7 @@ $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
$(RAMSCRGEN) ewram_data $< ENGLISH > $@ $(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 $(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) $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB) 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) $(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@ $(OBJCOPY) -O binary $< $@
$(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent $(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
asm/battle_anim_effects_3.s
-1588
View File
File diff suppressed because it is too large Load Diff
asm/contest_link_80F57C4.s
+7 -7
View File
@@ -578,10 +578,10 @@ _080F5D58:
adds r0, r5, 0 adds r0, r5, 0
movs r1, 0 movs r1, 0
bl VarSet bl VarSet
bl sub_8076D5C bl SetContinueGameWarpStatusToDynamicWarp
movs r0, 0x1 movs r0, 0x1
bl TrySavingData bl TrySavingData
bl sav2_gender2_inplace_and_xFE bl ClearContinueGameWarpStatus2
adds r0, r5, 0 adds r0, r5, 0
adds r1, r4, 0 adds r1, r4, 0
bl VarSet bl VarSet
@@ -606,7 +606,7 @@ _080F5DE0:
movs r0, 0x64 movs r0, 0x64
b _080F5E2C b _080F5E2C
_080F5DF4: _080F5DF4:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080F5EBA beq _080F5EBA
@@ -616,7 +616,7 @@ _080F5DF4:
strh r0, [r4, 0x8] strh r0, [r4, 0x8]
b _080F5EBA b _080F5EBA
_080F5E0A: _080F5E0A:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -741,7 +741,7 @@ sub_80F5F30: @ 80F5F30
push {r4,lr} push {r4,lr}
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080F5F60 beq _080F5F60
@@ -5564,7 +5564,7 @@ sub_80F8714: @ 80F8714
ldrh r0, [r0] ldrh r0, [r0]
cmp r0, 0x1 cmp r0, 0x1
bne _080F8748 bne _080F8748
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080F877E beq _080F877E
@@ -5598,7 +5598,7 @@ _080F874C:
movs r3, 0x1 movs r3, 0x1
negs r3, r3 negs r3, r3
movs r0, 0 movs r0, 0
bl saved_warp2_set bl SetDynamicWarp
bl ScriptContext2_Disable bl ScriptContext2_Disable
bl EnableBothScriptContexts bl EnableBothScriptContexts
_080F877E: _080F877E:
asm/contest_link_80FC4F4.s
+18 -18
View File
@@ -213,7 +213,7 @@ sub_80FC670: @ 80FC670
beq _080FC6A0 beq _080FC6A0
cmp r0, 0x1 cmp r0, 0x1
beq _080FC6AE beq _080FC6AE
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -223,7 +223,7 @@ _080FC698:
b _080FC6B6 b _080FC6B6
.pool .pool
_080FC6A0: _080FC6A0:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FC6B4 beq _080FC6B4
@@ -280,7 +280,7 @@ _080FC6FE:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FC738 bne _080FC738
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FC7F4 beq _080FC7F4
@@ -412,7 +412,7 @@ _080FC830:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FC87A bne _080FC87A
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FC880 beq _080FC880
@@ -494,7 +494,7 @@ _080FC8DE:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FC904 bne _080FC904
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FC986 beq _080FC986
@@ -599,7 +599,7 @@ sub_80FC998: @ 80FC998
b _080FC9F0 b _080FC9F0
.pool .pool
_080FC9C4: _080FC9C4:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FC9F0 beq _080FC9F0
@@ -653,7 +653,7 @@ sub_80FC9F8: @ 80FC9F8
b _080FCAB2 b _080FCAB2
.pool .pool
_080FCA30: _080FCA30:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCAB2 beq _080FCAB2
@@ -763,7 +763,7 @@ _080FCAFC:
.4byte _080FCC38 .4byte _080FCC38
.4byte _080FCB6C .4byte _080FCB6C
_080FCB2C: _080FCB2C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FCB38 bne _080FCB38
@@ -810,7 +810,7 @@ _080FCB84:
strh r0, [r2, 0x8] strh r0, [r2, 0x8]
b _080FCC82 b _080FCC82
_080FCB90: _080FCB90:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCC82 beq _080FCC82
@@ -833,7 +833,7 @@ _080FCBA4:
b _080FCC50 b _080FCC50
.pool .pool
_080FCBCC: _080FCBCC:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCC82 beq _080FCC82
@@ -856,7 +856,7 @@ _080FCBE0:
b _080FCC50 b _080FCC50
.pool .pool
_080FCC08: _080FCC08:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCC82 beq _080FCC82
@@ -949,7 +949,7 @@ _080FCCB8:
.4byte _080FCDF8 .4byte _080FCDF8
.4byte _080FCD30 .4byte _080FCD30
_080FCCE8: _080FCCE8:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FCCF4 bne _080FCCF4
@@ -1000,7 +1000,7 @@ _080FCD48:
strh r0, [r2, 0x8] strh r0, [r2, 0x8]
b _080FCE42 b _080FCE42
_080FCD54: _080FCD54:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCE42 beq _080FCE42
@@ -1027,7 +1027,7 @@ _080FCD6C:
b _080FCE10 b _080FCE10
.pool .pool
_080FCD98: _080FCD98:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCE42 beq _080FCE42
@@ -1047,7 +1047,7 @@ _080FCDB0:
b _080FCE04 b _080FCE04
.pool .pool
_080FCDC8: _080FCDC8:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCE42 beq _080FCE42
@@ -1149,7 +1149,7 @@ _080FCE92:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _080FCEB8 bne _080FCEB8
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCF2E beq _080FCF2E
@@ -1258,7 +1258,7 @@ sub_80FCF40: @ 80FCF40
b _080FCFBE b _080FCFBE
.pool .pool
_080FCF80: _080FCF80:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FCFBE beq _080FCFBE
@@ -1324,7 +1324,7 @@ sub_80FCFD0: @ 80FCFD0
b _080FD04E b _080FD04E
.pool .pool
_080FD010: _080FD010:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080FD04E beq _080FD04E
asm/contest_link_81D9DE4.s
+5 -5
View File
@@ -434,7 +434,7 @@ sub_81DA160: @ 81DA160
b _081DA224 b _081DA224
.pool .pool
_081DA1A4: _081DA1A4:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081DA224 beq _081DA224
@@ -536,7 +536,7 @@ _081DA284:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081DA2CE bne _081DA2CE
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081DA2D4 beq _081DA2D4
@@ -613,7 +613,7 @@ sub_81DA2E8: @ 81DA2E8
b _081DA39E b _081DA39E
.pool .pool
_081DA338: _081DA338:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081DA39E beq _081DA39E
@@ -716,7 +716,7 @@ sub_81DA3B8: @ 81DA3B8
b _081DA46E b _081DA46E
.pool .pool
_081DA408: _081DA408:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081DA46E beq _081DA46E
@@ -816,7 +816,7 @@ _081DA4CC:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _081DA4FA bne _081DA4FA
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _081DA55C beq _081DA55C
asm/contest_painting_effects.s
+1 -2180
View File
File diff suppressed because it is too large Load Diff
asm/macros/map.inc
+4
View File
@@ -101,3 +101,7 @@
map \map map \map
.space 2 .space 2
.endm .endm
.macro map_header_flags allow_bike:req, allow_escape_rope:req, allow_run:req, show_map_name:req
.byte ((\show_map_name & 1) << 3) | ((\allow_run & 1) << 2) | ((\allow_escape_rope & 1) << 1) | \allow_bike
.endm
asm/pokenav.s
+3 -3
View File
@@ -29324,14 +29324,14 @@ sub_81D5FB4: @ 81D5FB4
mov r9, r0 mov r9, r0
cmp r0, 0x6 cmp r0, 0x6
bne _081D5FD2 bne _081D5FD2
bl sub_8087D74 bl InitMapFromSavedGame
b _081D605E b _081D605E
_081D5FD2: _081D5FD2:
bl sub_81D56B0 bl sub_81D56B0
mov r0, r9 mov r0, r9
cmp r0, 0x5 cmp r0, 0x5
bne _081D5FE6 bne _081D5FE6
bl sub_8087D74 bl InitMapFromSavedGame
bl sub_81D5710 bl sub_81D5710
b _081D605E b _081D605E
_081D5FE6: _081D5FE6:
@@ -29342,7 +29342,7 @@ _081D5FE6:
ldr r0, =gMapHeader ldr r0, =gMapHeader
ldr r0, [r0] ldr r0, [r0]
ldr r2, [r0, 0xC] ldr r2, [r0, 0xC]
ldr r1, =gUnknown_03005DC0 ldr r1, =gBackupMapLayout
str r4, [r1, 0x8] str r4, [r1, 0x8]
movs r0, 0x1F movs r0, 0x1F
str r0, [r1] str r0, [r1]
asm/rom_8011DC0.s
+45 -45
View File
@@ -8257,7 +8257,7 @@ _0801AF24:
b _0801AF8A b _0801AF8A
.pool .pool
_0801AF40: _0801AF40:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801AFAE beq _0801AFAE
@@ -13680,7 +13680,7 @@ _0801DA72:
beq _0801DB46 beq _0801DB46
b _0801DB5E b _0801DB5E
_0801DA7C: _0801DA7C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801DB5E beq _0801DB5E
@@ -13713,7 +13713,7 @@ _0801DA7C:
b _0801DB3E b _0801DB3E
.pool .pool
_0801DAC8: _0801DAC8:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801DB5E beq _0801DB5E
@@ -13752,7 +13752,7 @@ _0801DB08:
strh r0, [r4, 0x10] strh r0, [r4, 0x10]
b _0801DB5E b _0801DB5E
_0801DB1C: _0801DB1C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801DB5E beq _0801DB5E
@@ -14364,7 +14364,7 @@ _0801DFCE:
adds r0, 0x1 adds r0, 0x1
strh r0, [r1, 0x6] strh r0, [r1, 0x6]
_0801DFE0: _0801DFE0:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E028 beq _0801E028
@@ -14389,7 +14389,7 @@ _0801DFE0:
b _0801E028 b _0801E028
.pool .pool
_0801E018: _0801E018:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E028 beq _0801E028
@@ -14838,7 +14838,7 @@ _0801E3AC:
b _0801E458 b _0801E458
.pool .pool
_0801E3D4: _0801E3D4:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E414 beq _0801E414
@@ -14978,7 +14978,7 @@ _0801E4E8:
b _0801E59A b _0801E59A
.pool .pool
_0801E50C: _0801E50C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E5BC beq _0801E5BC
@@ -15013,7 +15013,7 @@ _0801E540:
b _0801E59A b _0801E59A
.pool .pool
_0801E560: _0801E560:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E5BC beq _0801E5BC
@@ -15100,7 +15100,7 @@ _0801E604:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0801E662 bne _0801E662
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E662 beq _0801E662
@@ -15212,7 +15212,7 @@ _0801E6F0:
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
beq _0801E75C beq _0801E75C
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E75C beq _0801E75C
@@ -15304,7 +15304,7 @@ _0801E7AC:
adds r0, 0x1 adds r0, 0x1
strh r0, [r1, 0x6] strh r0, [r1, 0x6]
_0801E7C0: _0801E7C0:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
cmp r0, 0x1 cmp r0, 0x1
@@ -15348,7 +15348,7 @@ _0801E812:
b _0801E830 b _0801E830
.pool .pool
_0801E820: _0801E820:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0801E830 beq _0801E830
@@ -15686,7 +15686,7 @@ _0801EB04:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _0801EBC2 bne _0801EBC2
bl sub_8076D5C bl SetContinueGameWarpStatusToDynamicWarp
movs r0, 0 movs r0, 0
bl TrySavingData bl TrySavingData
ldr r0, =gUnknown_02022C84 ldr r0, =gUnknown_02022C84
@@ -15713,7 +15713,7 @@ _0801EB40:
bne _0801EBC2 bne _0801EBC2
movs r0, 0x37 movs r0, 0x37
bl PlaySE bl PlaySE
bl sav2_gender2_inplace_and_xFE bl ClearContinueGameWarpStatus2
ldr r0, =gUnknown_02022C84 ldr r0, =gUnknown_02022C84
ldr r1, [r0] ldr r1, [r0]
movs r0, 0xA movs r0, 0xA
@@ -20568,7 +20568,7 @@ _080211EC:
beq _080211F8 beq _080211F8
b _08021302 b _08021302
_080211F8: _080211F8:
bl sub_81971D0 bl InitStandardTextBoxWindows
bl sub_8197200 bl sub_8197200
adds r0, r5, 0 adds r0, r5, 0
bl sub_8022588 bl sub_8022588
@@ -20715,7 +20715,7 @@ _08021358:
bl sub_8010434 bl sub_8010434
b _0802143E b _0802143E
_0802135E: _0802135E:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08021444 beq _08021444
@@ -23804,7 +23804,7 @@ _08022CE4:
bl sub_8010434 bl sub_8010434
b _08022D06 b _08022D06
_08022CEA: _08022CEA:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08022D06 bne _08022D06
@@ -24016,7 +24016,7 @@ _08022E6C:
bl sub_8010434 bl sub_8010434
b _08022E9C b _08022E9C
_08022E72: _08022E72:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08022EA2 beq _08022EA2
@@ -24148,7 +24148,7 @@ _08022F74:
bl sub_8010434 bl sub_8010434
b _08023060 b _08023060
_08022F7A: _08022F7A:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08023066 beq _08023066
@@ -24170,7 +24170,7 @@ _08022F7A:
bl SendBlock bl SendBlock
b _08023060 b _08023060
_08022FAA: _08022FAA:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08023066 beq _08023066
@@ -24300,7 +24300,7 @@ _080230A8:
bl sub_8010434 bl sub_8010434
b _080231A8 b _080231A8
_080230BA: _080230BA:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080231AE beq _080231AE
@@ -24369,7 +24369,7 @@ _08023120:
b _080231A8 b _080231A8
.pool .pool
_08023150: _08023150:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080231AE beq _080231AE
@@ -24395,7 +24395,7 @@ _08023172:
bl sub_8010434 bl sub_8010434
b _080231A8 b _080231A8
_08023184: _08023184:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080231AE beq _080231AE
@@ -24547,7 +24547,7 @@ _0802329C:
bl sub_8010434 bl sub_8010434
b _080232DC b _080232DC
_080232BE: _080232BE:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080232E2 beq _080232E2
@@ -24591,7 +24591,7 @@ _08023302:
beq _08023338 beq _08023338
b _0802338C b _0802338C
_0802330C: _0802330C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08023392 beq _08023392
@@ -24612,7 +24612,7 @@ _08023332:
bl sub_8010434 bl sub_8010434
b _0802338C b _0802338C
_08023338: _08023338:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08023392 beq _08023392
@@ -25683,7 +25683,7 @@ _08023B7A:
strh r0, [r4, 0x10] strh r0, [r4, 0x10]
b _08023BB2 b _08023BB2
_08023B94: _08023B94:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08023BB8 beq _08023BB8
@@ -25785,7 +25785,7 @@ _08023C2A:
bl SetGpuReg bl SetGpuReg
b _08023C9C b _08023C9C
_08023C5C: _08023C5C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08023CA2 beq _08023CA2
@@ -25884,7 +25884,7 @@ _08023D12:
bl SendBlock bl SendBlock
b _0802402E b _0802402E
_08023D2A: _08023D2A:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
bne _08023D36 bne _08023D36
@@ -26227,7 +26227,7 @@ _08023FC4:
bl SendBlock bl SendBlock
b _0802402E b _0802402E
_08023FD0: _08023FD0:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08024034 beq _08024034
@@ -26451,7 +26451,7 @@ _080241A0:
bl sub_8010434 bl sub_8010434
b _08024218 b _08024218
_080241A6: _080241A6:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0802421E beq _0802421E
@@ -26630,7 +26630,7 @@ _08024300:
bl sub_8010434 bl sub_8010434
b _080243AC b _080243AC
_08024306: _08024306:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080243B2 beq _080243B2
@@ -26646,7 +26646,7 @@ _08024306:
bl SendBlock bl SendBlock
b _080243AC b _080243AC
_08024328: _08024328:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080243B2 beq _080243B2
@@ -26914,7 +26914,7 @@ _08024522:
bl sub_8010434 bl sub_8010434
b _08024558 b _08024558
_08024528: _08024528:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0802455E beq _0802455E
@@ -27814,7 +27814,7 @@ _08024C4C:
bl sub_8010434 bl sub_8010434
b _08024D20 b _08024D20
_08024C5A: _08024C5A:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08024D40 beq _08024D40
@@ -28075,7 +28075,7 @@ _08024E90:
b _08024EF0 b _08024EF0
.pool .pool
_08024EA0: _08024EA0:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08024F08 beq _08024F08
@@ -28116,7 +28116,7 @@ _08024EF0:
strb r0, [r1, 0x10] strb r0, [r1, 0x10]
b _08024F08 b _08024F08
_08024EF8: _08024EF8:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08024F08 beq _08024F08
@@ -28475,7 +28475,7 @@ _080251BA:
strb r4, [r0, 0x8] strb r4, [r0, 0x8]
b _08025202 b _08025202
_080251D0: _080251D0:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08025226 beq _08025226
@@ -28560,7 +28560,7 @@ _08025252:
ldr r1, [r5] ldr r1, [r5]
b _080252CC b _080252CC
_08025274: _08025274:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08025316 beq _08025316
@@ -28710,7 +28710,7 @@ _0802539C:
b _08025448 b _08025448
.pool .pool
_080253BC: _080253BC:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08025466 beq _08025466
@@ -28900,7 +28900,7 @@ _0802553C:
b _080255E8 b _080255E8
.pool .pool
_08025564: _08025564:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0802563C beq _0802563C
@@ -29391,7 +29391,7 @@ _0802593E:
b _08025976 b _08025976
.pool .pool
_0802596C: _0802596C:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080259E8 beq _080259E8
@@ -39128,7 +39128,7 @@ _0802A7CE:
movs r1, 0 movs r1, 0
movs r2, 0 movs r2, 0
bl ChangeBgY bl ChangeBgY
bl sub_81971D0 bl InitStandardTextBoxWindows
bl sub_8197200 bl sub_8197200
movs r1, 0x82 movs r1, 0x82
lsls r1, 5 lsls r1, 5
@@ -39683,7 +39683,7 @@ _0802AD3C:
b _0802ADC0 b _0802ADC0
.pool .pool
_0802AD68: _0802AD68:
bl sub_800A520 bl IsLinkTaskFinished
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0802AE08 beq _0802AE08
asm/trade.s
-14903
View File
File diff suppressed because it is too large Load Diff
asm/trainer_card.s
+2 -2
View File
@@ -4971,7 +4971,7 @@ _080C5204:
b _080C52C8 b _080C52C8
_080C5214: _080C5214:
str r4, [r0] str r4, [r0]
bl sav1_map_get_name bl GetCurrentRegionMapSectionId
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
cmp r4, 0x3A cmp r4, 0x3A
@@ -7780,7 +7780,7 @@ sub_80C6974: @ 80C6974
adds r1, r6 adds r1, r6
ldrb r1, [r1, 0xC] ldrb r1, [r1, 0xC]
bl StartSpriteAnim bl StartSpriteAnim
bl sav1_map_get_name bl GetCurrentRegionMapSectionId
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
cmp r5, 0x3A cmp r5, 0x3A
common_syms/fieldmap.txt
+1 -1
View File
@@ -1 +1 @@
gUnknown_03005DC0 gBackupMapLayout
constants/constants.inc
+1 -1
View File
@@ -1,5 +1,5 @@
.include "constants/gba_constants.inc" .include "constants/gba_constants.inc"
.include "constants/misc_constants.inc" .include "constants/global.inc"
.include "constants/contest_constants.inc" .include "constants/contest_constants.inc"
.include "constants/pokemon_data_constants.inc" .include "constants/pokemon_data_constants.inc"
.include "constants/berry_constants.inc" .include "constants/berry_constants.inc"
constants/misc_constants.inc → constants/global.inc
-3
View File
@@ -3,9 +3,6 @@
.set NULL, 0 .set NULL, 0
.set POKEMON_NAME_LENGTH, 11
.set MOVE_NAME_LENGTH, 13
.set SPRITE_SIZE_8x8, (OAM_SIZE_0 >> 28) | (OAM_SQUARE >> 14) .set SPRITE_SIZE_8x8, (OAM_SIZE_0 >> 28) | (OAM_SQUARE >> 14)
.set SPRITE_SIZE_16x16, (OAM_SIZE_1 >> 28) | (OAM_SQUARE >> 14) .set SPRITE_SIZE_16x16, (OAM_SIZE_1 >> 28) | (OAM_SQUARE >> 14)
.set SPRITE_SIZE_32x32, (OAM_SIZE_2 >> 28) | (OAM_SQUARE >> 14) .set SPRITE_SIZE_32x32, (OAM_SIZE_2 >> 28) | (OAM_SQUARE >> 14)
data/battle_anim_scripts.s
+114 -114
View File
@@ -1252,12 +1252,12 @@ Move_REVERSAL:
createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE createvisualtask sub_8115A04, 2, 31, 3, 2, 0, 10, RGB_WHITE
delay 10 delay 10
playsewithpan SE_W179, SOUND_PAN_ATTACKER playsewithpan SE_W179, SOUND_PAN_ATTACKER
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 0 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 0
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 42 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 42
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 84 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 84
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 126 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 126
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 168 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 168
createsprite gBattleAnimSpriteTemplate_85CE5D8, ANIM_ATTACKER, 2, 26, 210 createsprite gReversalOrbSpriteTemplate, ANIM_ATTACKER, 2, 26, 210
waitforvisualfinish waitforvisualfinish
delay 20 delay 20
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
@@ -1751,7 +1751,7 @@ Frustration_Strong:
createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28 createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28
waitforvisualfinish waitforvisualfinish
delay 5 delay 5
createvisualtask sub_815C3A8, 5 createvisualtask AnimTask_StrongFrustrationGrowAndShrink, 5
delay 7 delay 7
playsewithpan SE_W004, SOUND_PAN_TARGET playsewithpan SE_W004, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 8, 1, 1
@@ -1785,7 +1785,7 @@ Frustration_Medium:
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
goto Frustration_Continue goto Frustration_Continue
Frustration_Weak: Frustration_Weak:
createsprite gUnknown_085CE4D0, ANIM_ATTACKER, 2, 20, -28 createsprite gWeakFrustrationAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 20, -28
waitforvisualfinish waitforvisualfinish
delay 10 delay 10
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 10, 2
@@ -1815,26 +1815,26 @@ Move_SAFEGUARD:
Move_PAIN_SPLIT: Move_PAIN_SPLIT:
loadspritegfx ANIM_TAG_PAIN_SPLIT loadspritegfx ANIM_TAG_PAIN_SPLIT
createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -8, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -8, -42, ANIM_ATTACKER
createsprite gUnknown_085CE590, ANIM_TARGET, 2, -8, -42, 1 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -8, -42, ANIM_TARGET
delay 10 delay 10
playsewithpan SE_W207B, 0 playsewithpan SE_W207B, 0
createvisualtask sub_815CA20, 2, 0, 0 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 0
createvisualtask sub_815CA20, 2, 1, 0 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 0
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, -24, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, -24, -42, ANIM_ATTACKER
createsprite gUnknown_085CE590, ANIM_TARGET, 2, -24, -42, 1 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, -24, -42, ANIM_TARGET
delay 10 delay 10
playsewithpan SE_W207B, 0 playsewithpan SE_W207B, 0
createvisualtask sub_815CA20, 2, 0, 1 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 1
createvisualtask sub_815CA20, 2, 1, 1 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 1
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_085CE590, ANIM_ATTACKER, 2, 8, -42, 0 createsprite gPainSplitProjectileSpriteTemplate, ANIM_ATTACKER, 2, 8, -42, ANIM_ATTACKER
createsprite gUnknown_085CE590, ANIM_TARGET, 2, 8, -42, 1 createsprite gPainSplitProjectileSpriteTemplate, ANIM_TARGET, 2, 8, -42, ANIM_TARGET
delay 10 delay 10
playsewithpan SE_W207B, 0 playsewithpan SE_W207B, 0
createvisualtask sub_815CA20, 2, 0, 2 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_ATTACKER, 2
createvisualtask sub_815CA20, 2, 1, 2 createvisualtask AnimTask_PainSplitMovement, 2, ANIM_TARGET, 2
end end
Move_VICE_GRIP: Move_VICE_GRIP:
@@ -2888,7 +2888,7 @@ Move_KINESIS:
Move_GLARE: Move_GLARE:
loadspritegfx ANIM_TAG_SMALL_RED_EYE loadspritegfx ANIM_TAG_SMALL_RED_EYE
loadspritegfx ANIM_TAG_EYE_SPARKLE loadspritegfx ANIM_TAG_EYE_SPARKLE
createvisualtask sub_815E114, 5, 0 createvisualtask AnimTask_GlareEyeDots, 5, 0
playsewithpan SE_W060B, SOUND_PAN_ATTACKER playsewithpan SE_W060B, SOUND_PAN_ATTACKER
waitforvisualfinish waitforvisualfinish
createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK createvisualtask sub_8116620, 5, 1, 0, 0, 16, RGB_BLACK
@@ -2905,7 +2905,7 @@ Move_GLARE:
Move_BARRAGE: Move_BARRAGE:
loadspritegfx ANIM_TAG_RED_BALL loadspritegfx ANIM_TAG_RED_BALL
createvisualtask sub_815E47C, 3 createvisualtask AnimTask_BarrageBall, 3
playsewithpan SE_W207, SOUND_PAN_ATTACKER playsewithpan SE_W207, SOUND_PAN_ATTACKER
delay 24 delay 24
createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 8, 1, 40, 1 createsprite gBattleAnimSpriteTemplate_85972D8, ANIM_ATTACKER, 2, 8, 1, 40, 1
@@ -2996,7 +2996,7 @@ Move_SPLASH:
Move_ACID_ARMOR: Move_ACID_ARMOR:
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
setalpha 15, 0 setalpha 15, 0
createvisualtask sub_815D240, 2, 0 createvisualtask AnimTask_AcidArmor, 2, ANIM_ATTACKER
playsewithpan SE_W151, SOUND_PAN_ATTACKER playsewithpan SE_W151, SOUND_PAN_ATTACKER
waitforvisualfinish waitforvisualfinish
blendoff blendoff
@@ -3096,7 +3096,7 @@ Move_FLAIL:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
monbg ANIM_TARGET monbg ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
createvisualtask sub_815C770, 2, 0 createvisualtask AnimTask_FlailMovement, 2, ANIM_ATTACKER
loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2 loopsewithpan SE_W029, SOUND_PAN_ATTACKER, 8, 2
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 3 createsprite gUnknown_085973A0, ANIM_TARGET, 3, 1, 3
@@ -3158,7 +3158,7 @@ Move_FORESIGHT:
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET monbgprio_28 ANIM_TARGET
setalpha 16, 0 setalpha 16, 0
createsprite gUnknown_085CE8C4, ANIM_TARGET, 2, 1 createsprite gForesightMagnifyingGlassSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET
delay 17 delay 17
loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4 loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4
delay 48 delay 48
@@ -3219,7 +3219,7 @@ EndureEffect:
Move_CHARM: Move_CHARM:
loadspritegfx ANIM_TAG_MAGENTA_HEART 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 createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15 delay 15
@@ -3529,23 +3529,23 @@ Move_MEMENTO:
Move_FACADE: Move_FACADE:
loadspritegfx ANIM_TAG_SWEAT_DROP loadspritegfx ANIM_TAG_SWEAT_DROP
createvisualtask sub_815DCA4, 2, 0, 3 createvisualtask AnimTask_SquishAndSweatDroplets, 2, ANIM_ATTACKER, 3
createvisualtask sub_815DF0C, 2, 0, 72 createvisualtask AnimTask_FacadeColorBlend, 2, ANIM_ATTACKER, 72
loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3 loopsewithpan SE_W207, SOUND_PAN_ATTACKER, 24, 3
end end
Move_SMELLING_SALT: Move_SMELLING_SALT:
loadspritegfx ANIM_TAG_TAG_HAND loadspritegfx ANIM_TAG_TAG_HAND
loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT loadspritegfx ANIM_TAG_SMELLINGSALT_EFFECT
createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 0, 2 createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 2
createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 1, 2 createsprite gSmellingSaltsHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 2
delay 32 delay 32
createvisualtask sub_815E840, 3, 1, 2 createvisualtask AnimTask_SmellingSaltsSquish, 3, ANIM_TARGET, 2
loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2 loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2
waitforvisualfinish waitforvisualfinish
delay 4 delay 4
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2 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 loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3
end end
@@ -3616,9 +3616,9 @@ Move_TAUNT:
Move_HELPING_HAND: Move_HELPING_HAND:
loadspritegfx ANIM_TAG_TAG_HAND loadspritegfx ANIM_TAG_TAG_HAND
createvisualtask sub_815EC48, 5 createvisualtask AnimTask_HelpingHandAttackerMovement, 5
createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 0 createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0
createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 1 createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1
delay 19 delay 19
playsewithpan SE_W227, 0 playsewithpan SE_W227, 0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1
@@ -3633,18 +3633,18 @@ Move_HELPING_HAND:
Move_ASSIST: Move_ASSIST:
loadspritegfx ANIM_TAG_PAW_PRINT 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 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 playsewithpan SE_W010, 0
delay 2 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 playsewithpan SE_W010, 0
delay 2 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 playsewithpan SE_W010, 0
delay 2 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 playsewithpan SE_W010, 0
end end
@@ -3687,7 +3687,7 @@ Move_RECYCLE:
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
setalpha 0, 16 setalpha 0, 16
delay 1 delay 1
createsprite gUnknown_085CE9B0, ANIM_ATTACKER, 2 createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2
loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3 loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1
@@ -3764,24 +3764,24 @@ BrickBreakShatteredWall:
Move_YAWN: Move_YAWN:
loadspritegfx ANIM_TAG_PINK_CLOUD loadspritegfx ANIM_TAG_PINK_CLOUD
createvisualtask sub_815D64C, 2, 0 createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER
playsewithpan SE_W281, SOUND_PAN_ATTACKER playsewithpan SE_W281, SOUND_PAN_ATTACKER
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 2 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 2
playsewithpan SE_W255, SOUND_PAN_ATTACKER playsewithpan SE_W255, SOUND_PAN_ATTACKER
delay 4 delay 4
createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 1 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 1
delay 4 delay 4
createsprite gUnknown_085CE68C, ANIM_TARGET, 5, 0 createsprite gYawnCloudSpriteTemplate, ANIM_TARGET, 5, 0
waitforvisualfinish waitforvisualfinish
createvisualtask sub_815D64C, 2, 1 createvisualtask AnimTask_DeepInhale, 2, ANIM_TARGET
playsewithpan SE_W281, SOUND_PAN_TARGET playsewithpan SE_W281, SOUND_PAN_TARGET
end end
Move_ENDEAVOR: Move_ENDEAVOR:
loadspritegfx ANIM_TAG_SWEAT_DROP loadspritegfx ANIM_TAG_SWEAT_DROP
loadspritegfx ANIM_TAG_IMPACT 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 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 24, 2
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2 createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(31, 21, 0), 12, 1, 2
delay 6 delay 6
@@ -3989,7 +3989,7 @@ Move_FEATHER_DANCE:
Move_TEETER_DANCE: Move_TEETER_DANCE:
loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_MUSIC_NOTES
loadspritegfx ANIM_TAG_DUCK loadspritegfx ANIM_TAG_DUCK
createvisualtask sub_8160164, 5 createvisualtask AnimTask_TeeterDanceMovement, 5
createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, 16, -2 createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, 16, -2
playsewithpan SE_W298, SOUND_PAN_ATTACKER playsewithpan SE_W298, SOUND_PAN_ATTACKER
delay 24 delay 24
@@ -4098,7 +4098,7 @@ Move_NEEDLE_ARM:
Move_SLACK_OFF: Move_SLACK_OFF:
loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_BLUE_STAR
createvisualtask sub_8160544, 2, 0 createvisualtask AnimTask_SlackOffSquish, 2, ANIM_ATTACKER
playsewithpan SE_W281, SOUND_PAN_ATTACKER playsewithpan SE_W281, SOUND_PAN_ATTACKER
waitforvisualfinish waitforvisualfinish
call HealingEffect call HealingEffect
@@ -4171,7 +4171,7 @@ Move_FAKE_TEARS:
loadspritegfx ANIM_TAG_MUSIC_NOTES loadspritegfx ANIM_TAG_MUSIC_NOTES
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31) createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 4, 4, RGB(12, 11, 31)
waitforvisualfinish waitforvisualfinish
createvisualtask sub_815C478, 5, 0, 2, 1 createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 1
loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4 loopsewithpan SE_W039, SOUND_PAN_ATTACKER, 12, 4
delay 8 delay 8
createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 0 createsprite gUnknown_085970E8, ANIM_ATTACKER, 2, 0, 0
@@ -4211,7 +4211,7 @@ Move_AIR_CUTTER:
Move_ODOR_SLEUTH: Move_ODOR_SLEUTH:
monbg ANIM_TARGET monbg ANIM_TARGET
createvisualtask sub_815F620, 5 createvisualtask AnimTask_OdorSleuthMovement, 5
delay 24 delay 24
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4
playsewithpan SE_W207, SOUND_PAN_ATTACKER playsewithpan SE_W207, SOUND_PAN_ATTACKER
@@ -4275,7 +4275,7 @@ Move_TICKLE:
delay 20 delay 20
createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER createvisualtask AnimTask_SwayMon, 3, 0, 6, 1280, 3, ANIM_ATTACKER
delay 12 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 loopsewithpan SE_W039, SOUND_PAN_TARGET, 8, 8
waitforvisualfinish waitforvisualfinish
end end
@@ -4365,13 +4365,13 @@ Move_IRON_DEFENSE:
Move_BLOCK: Move_BLOCK:
loadspritegfx ANIM_TAG_X_SIGN loadspritegfx ANIM_TAG_X_SIGN
createsprite gUnknown_085CE90C, ANIM_TARGET, 66 createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66
playsewithpan SE_W207, SOUND_PAN_TARGET playsewithpan SE_W207, SOUND_PAN_TARGET
end end
Move_HOWL: Move_HOWL:
loadspritegfx ANIM_TAG_NOISE_LINE loadspritegfx ANIM_TAG_NOISE_LINE
createvisualtask sub_815D64C, 2, 0 createvisualtask AnimTask_DeepInhale, 2, 0
delay 12 delay 12
call RoarEffect call RoarEffect
createvisualtask sub_8158D8C, 2, 0, 3 createvisualtask sub_8158D8C, 2, 0, 3
@@ -4392,7 +4392,7 @@ Move_BULK_UP:
Move_COVET: Move_COVET:
loadspritegfx ANIM_TAG_MAGENTA_HEART loadspritegfx ANIM_TAG_MAGENTA_HEART
loadspritegfx ANIM_TAG_ITEM_BAG 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 createsprite gUnknown_08593970, ANIM_ATTACKER, 3, 0, 20
playsewithpan SE_W204, SOUND_PAN_ATTACKER playsewithpan SE_W204, SOUND_PAN_ATTACKER
delay 15 delay 15
@@ -4973,13 +4973,13 @@ Move_ROAR:
end end
RoarEffect: RoarEffect:
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 0
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 2
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1
delay 15 delay 15
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, -8, 0 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, -8, 0
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 0, 2 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 2
createsprite gUnknown_085CE7D4, ANIM_ATTACKER, 2, 24, 8, 1 createsprite gRoarNoiseLineSpriteTemplate, ANIM_ATTACKER, 2, 24, 8, 1
return return
Move_GROWL: Move_GROWL:
@@ -8312,38 +8312,38 @@ MorningSun1:
Move_SWEET_SCENT: Move_SWEET_SCENT:
loadspritegfx ANIM_TAG_PINK_PETAL loadspritegfx ANIM_TAG_PINK_PETAL
playsewithpan SE_W230, SOUND_PAN_ATTACKER 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 delay 25
setpan 0 setpan 0
call SweetScentEffect call SweetScentEffect
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 55, 0 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 55, 0
setpan SOUND_PAN_TARGET setpan SOUND_PAN_TARGET
createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21) createvisualtask sub_8115A04, 2, 20, 1, 5, 5, 13, RGB(31, 21, 21)
call SweetScentEffect call SweetScentEffect
waitforvisualfinish waitforvisualfinish
end end
SweetScentEffect: SweetScentEffect:
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 70, 1, 64 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 70, 1, 64
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 60, 0, 64 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 60, 0, 64
delay 5 delay 5
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 80, 1, 64 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 80, 1, 64
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 58, 0, 120 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 58, 0, 120
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 120
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 90, 0, 64 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 90, 0, 64
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 48, 0, 64 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 48, 0, 64
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 95, 1, 80 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 95, 1, 80
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 100, 0, 120 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 100, 0, 120
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 75, 1, 64 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 75, 1, 64
delay 2 delay 2
createsprite gUnknown_085CE544, ANIM_ATTACKER, 2, 85, 0, 120 createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 85, 0, 120
delay 2 delay 2
return return
@@ -8404,32 +8404,32 @@ Move_FLATTER:
createvisualtask sub_815ABEC, 2 createvisualtask sub_815ABEC, 2
createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0 createvisualtask sub_8116960, 2, 248, 3, 0, 10, 0
waitforvisualfinish waitforvisualfinish
createsprite gUnknown_085CE5C0, ANIM_TARGET, 2, 0, -8, 80 createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80
delay 0 delay 0
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET
delay 10 delay 10
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 5, 2, ANIM_TARGET
delay 0 delay 0
createvisualtask sub_8159210, 5, 229, SOUND_PAN_ATTACKER createvisualtask sub_8159210, 5, 229, SOUND_PAN_ATTACKER
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
call Flatter1 call CreateFlatterConfetti
delay 5 delay 5
createvisualtask sub_8159210, 5, 229, SOUND_PAN_TARGET createvisualtask sub_8159210, 5, 229, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
@@ -8437,9 +8437,9 @@ Move_FLATTER:
waitforvisualfinish waitforvisualfinish
createvisualtask sub_815AC8C, 2 createvisualtask sub_815AC8C, 2
end end
Flatter1: CreateFlatterConfetti:
createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 0 createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, ANIM_ATTACKER
createsprite gUnknown_085CE5A8, ANIM_ATTACKER, 40, 1 createsprite gFlatterConfettiSpriteTemplate, ANIM_ATTACKER, 40, ANIM_TARGET
return return
Move_ROLE_PLAY: Move_ROLE_PLAY:
@@ -8449,7 +8449,7 @@ Move_ROLE_PLAY:
waitforvisualfinish waitforvisualfinish
playsewithpan SE_W161, SOUND_PAN_ATTACKER playsewithpan SE_W161, SOUND_PAN_ATTACKER
waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30 waitplaysewithpan SE_W197, SOUND_PAN_ATTACKER, 30
createvisualtask sub_815CED8, 2 createvisualtask AnimTask_RolePlaySilhouette, 2
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER clearmonbg ANIM_ATK_PARTNER
createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE createvisualtask sub_8116620, 10, 4, 2, 16, 0, RGB_WHITE
@@ -8718,12 +8718,12 @@ Move_METEOR_MASH:
fadetobg BG_COSMIC fadetobg BG_COSMIC
waitbgfadein waitbgfadein
waitforvisualfinish 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 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 delay 40
createsprite gUnknown_08595F14, ANIM_TARGET, 3, 0, 0, 0, 30 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 delay 20
playsewithpan SE_W233B, SOUND_PAN_TARGET playsewithpan SE_W233B, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
@@ -9551,7 +9551,7 @@ Move_KNOCK_OFF:
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
delay 4 delay 4
playsewithpan SE_W233, SOUND_PAN_TARGET playsewithpan SE_W233, SOUND_PAN_TARGET
createsprite gUnknown_085CE984, ANIM_TARGET, 2, -16, -16 createsprite gKnockOffStrikeSpriteTemplate, ANIM_TARGET, 2, -16, -16
delay 8 delay 8
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2
@@ -10450,31 +10450,31 @@ General_SmokeballEscape:
setalpha 12, 4 setalpha 12, 4
delay 0 delay 0
playsewithpan SE_BOWA2, SOUND_PAN_TARGET 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 delay 4
playsewithpan SE_BOWA2, SOUND_PAN_TARGET 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 delay 12
playsewithpan SE_BOWA2, SOUND_PAN_TARGET 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 delay 12
playsewithpan SE_BOWA2, SOUND_PAN_TARGET 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 delay 4
playsewithpan SE_BOWA2, SOUND_PAN_TARGET playsewithpan SE_BOWA2, SOUND_PAN_TARGET
createvisualtask sub_81136E8, 2, 2 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 delay 14
playsewithpan SE_BOWA2, SOUND_PAN_TARGET 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 delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 121, 3, 14, -14, 46 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, -14, 46
delay 0 delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 120, 3, -12, -10, 46 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 120, 3, -12, -10, 46
delay 0 delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 119, 3, 14, 14, 46 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 119, 3, 14, 14, 46
delay 0 delay 0
createsprite gUnknown_085CE734, ANIM_ATTACKER, 118, 3, 0, 0, 46 createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 118, 3, 0, 0, 46
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATTACKER clearmonbg ANIM_ATTACKER
invisible ANIM_ATTACKER invisible ANIM_ATTACKER
@@ -10556,11 +10556,11 @@ SnatchMoveContinue:
end end
SnatchOpposingMonMove: SnatchOpposingMonMove:
playsewithpan SE_W104, SOUND_PAN_ATTACKER playsewithpan SE_W104, SOUND_PAN_ATTACKER
createvisualtask sub_815F8F4, 2 createvisualtask AnimTask_SnatchOpposingMonMove, 2
goto SnatchMoveContinue goto SnatchMoveContinue
SnatchPartnerMonMove: SnatchPartnerMonMove:
playsewithpan SE_W104, SOUND_PAN_ATTACKER playsewithpan SE_W104, SOUND_PAN_ATTACKER
createvisualtask sub_815FFC4, 2 createvisualtask AnimTask_SnatchPartnerMove, 2
goto SnatchMoveContinue goto SnatchMoveContinue
General_FutureSightHit: General_FutureSightHit:
data/event_scripts.s
+8 -7
View File
@@ -1,3 +1,4 @@
#include "constants/global.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/battle_setup.h" #include "constants/battle_setup.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
@@ -1792,9 +1793,9 @@ Route110_EventScript_271ED7:: @ 8271ED7
Route119_EventScript_271ED7:: @ 8271ED7 Route119_EventScript_271ED7:: @ 8271ED7
RustboroCity_EventScript_271ED7:: @ 8271ED7 RustboroCity_EventScript_271ED7:: @ 8271ED7
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, MALE
goto_if_eq RustboroCity_EventScript_271EEF goto_if_eq RustboroCity_EventScript_271EEF
compare VAR_RESULT, 1 compare VAR_RESULT, FEMALE
goto_if_eq RustboroCity_EventScript_271EF5 goto_if_eq RustboroCity_EventScript_271EF5
end end
@@ -1810,9 +1811,9 @@ LavaridgeTown_EventScript_271EFB:: @ 8271EFB
Route110_EventScript_271EFB:: @ 8271EFB Route110_EventScript_271EFB:: @ 8271EFB
Route119_EventScript_271EFB:: @ 8271EFB Route119_EventScript_271EFB:: @ 8271EFB
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, MALE
goto_if_eq LavaridgeTown_EventScript_271F13 goto_if_eq LavaridgeTown_EventScript_271F13
compare VAR_RESULT, 1 compare VAR_RESULT, FEMALE
goto_if_eq LavaridgeTown_EventScript_271F19 goto_if_eq LavaridgeTown_EventScript_271F19
end end
@@ -1826,9 +1827,9 @@ LavaridgeTown_EventScript_271F19:: @ 8271F19
EventScript_271F1F:: @ 8271F1F EventScript_271F1F:: @ 8271F1F
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, MALE
goto_if_eq EventScript_271F37 goto_if_eq EventScript_271F37
compare VAR_RESULT, 1 compare VAR_RESULT, FEMALE
goto_if_eq EventScript_271F3D goto_if_eq EventScript_271F3D
end end
@@ -4768,7 +4769,7 @@ gUnknown_082A8350:: @ 82A8350
waitmovement 0 waitmovement 0
playse SE_RU_HYUU playse SE_RU_HYUU
delay 60 delay 60
special sp13F_fall_to_last_warp special DoFallWarp
waitstate waitstate
end end
data/field_effect_scripts.s
+1 -1
View File
@@ -341,5 +341,5 @@ gFieldEffectScript_Unknown65:: @ 82DBCF9
field_eff_end field_eff_end
gFieldEffectScript_Unknown66:: @ 82DBCFF gFieldEffectScript_Unknown66:: @ 82DBCFF
field_eff_callnative sub_80B9E28 field_eff_callnative Fldeff_MoveDeoxysRock
field_eff_end field_eff_end
data/layouts/Route111_NoMirageTower/layout.inc
+1
View File
@@ -12,3 +12,4 @@ Route111_NoMirageTower_Layout::
.4byte Route111_NoMirageTower_MapBlockdata .4byte Route111_NoMirageTower_MapBlockdata
.4byte gTileset_General .4byte gTileset_General
.4byte gTileset_Mauville .4byte gTileset_Mauville
data/maps/AbandonedShip_CaptainsOffice/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_CaptainsOffice: @ 84845A4
.byte WEATHER_SHADE .byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Corridors_1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Corridors_1F: @ 84844C4
.byte WEATHER_SHADE .byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Corridors_B1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Corridors_B1F: @ 84844FC
.byte WEATHER_SHADE .byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Deck/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Deck: @ 84844A8
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC
.byte WEATHER_SHADE .byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8
.byte WEATHER_SHADE .byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 7 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Room_B1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Room_B1F: @ 848456C
.byte WEATHER_SHADE .byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Rooms2_1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Rooms2_1F: @ 8484588
.byte WEATHER_SHADE .byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Rooms2_B1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Rooms2_B1F: @ 8484534
.byte WEATHER_SHADE .byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Rooms_1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Rooms_1F: @ 84844E0
.byte WEATHER_SHADE .byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Rooms_B1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Rooms_B1F: @ 8484518
.byte WEATHER_SHADE .byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Underwater1/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Underwater1: @ 8484550
.byte WEATHER_BUBBLES .byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER .byte MAP_TYPE_UNDERWATER
.2byte 0 .2byte 0
.byte 13 map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AbandonedShip_Underwater2/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Underwater2: @ 84845C0
.byte WEATHER_BUBBLES .byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER .byte MAP_TYPE_UNDERWATER
.2byte 0 .2byte 0
.byte 13 map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AlteringCave/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AlteringCave: @ 8484A58
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AncientTomb/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AncientTomb: @ 8484630
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/AquaHideout_1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AquaHideout_1F: @ 8484144
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 8 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
.byte MAP_BATTLE_SCENE_AQUA .byte MAP_BATTLE_SCENE_AQUA
data/maps/AquaHideout_B1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AquaHideout_B1F: @ 8484160
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 8 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
.byte MAP_BATTLE_SCENE_AQUA .byte MAP_BATTLE_SCENE_AQUA
data/maps/AquaHideout_B2F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AquaHideout_B2F: @ 848417C
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 8 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=1
.byte MAP_BATTLE_SCENE_AQUA .byte MAP_BATTLE_SCENE_AQUA
data/maps/AquaHideout_UnusedRubyMap1/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap1: @ 84846D8
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_MAGMA .byte MAP_BATTLE_SCENE_MAGMA
data/maps/AquaHideout_UnusedRubyMap2/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap2: @ 84846F4
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_MAGMA .byte MAP_BATTLE_SCENE_MAGMA
data/maps/AquaHideout_UnusedRubyMap3/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap3: @ 8484710
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_MAGMA .byte MAP_BATTLE_SCENE_MAGMA
data/maps/ArtisanCave_1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ ArtisanCave_1F: @ 84849B0
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/ArtisanCave_B1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ ArtisanCave_B1F: @ 8484994
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND .byte MAP_TYPE_UNDERGROUND
.2byte 0 .2byte 0
.byte 15 map_header_flags allow_bike=1, allow_escape_rope=1, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc
+2 -2
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 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 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 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 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_TRADER, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 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 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 BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4
data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+2 -2
View File
@@ -17,9 +17,9 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6 goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6
compare VAR_RESULT, 1 compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC
return return
data/maps/BattleFrontier_BattleArenaCorridor/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaCorridor: @ 8485468
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleArenaLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaLobby: @ 848544C
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc
+2 -2
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 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 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 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 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 BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+2 -2
View File
@@ -20,9 +20,9 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4 goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4
compare VAR_RESULT, 1 compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA
return return
data/maps/BattleFrontier_BattleDomeCorridor/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeCorridor: @ 8485350
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleDomeLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeLobby: @ 8485334
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
+2 -2
View File
@@ -1,12 +1,12 @@
BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC 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 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 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 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 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 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 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 BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+2 -2
View File
@@ -8,9 +8,9 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
setvar VAR_0x8004, 5 setvar VAR_0x8004, 5
special CallFrontierUtilFunc special CallFrontierUtilFunc
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, MALE
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25 call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
compare VAR_RESULT, 1 compare VAR_RESULT, FEMALE
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
setvar VAR_0x8004, 9 setvar VAR_0x8004, 9
special CallFrontierUtilFunc special CallFrontierUtilFunc
data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
+2 -2
View File
@@ -1,6 +1,6 @@
BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC 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 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_HIPSTER, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 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 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 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 object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+2 -2
View File
@@ -12,9 +12,9 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833 BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833
checkplayergender checkplayergender
compare VAR_RESULT, 0 compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B
compare VAR_RESULT, 1 compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856 goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856
return return
data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePalaceLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePikeCorridor/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeCorridor: @ 8485510
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePikeLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeLobby: @ 84854F4
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
+2 -2
View File
@@ -1,6 +1,6 @@
BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54 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 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_TRADER, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 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 BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattlePyramidTop/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidTop: @ 8485430
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
+1 -1
View File
@@ -1,5 +1,5 @@
BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 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 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 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_FRONTIER .byte MAP_BATTLE_SCENE_FRONTIER
data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
+4 -4
View File
@@ -1,10 +1,10 @@
BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 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 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 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 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, 255, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 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, 254, 0, 5, 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 BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054
map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_FRONTIER .byte MAP_BATTLE_SCENE_FRONTIER
data/maps/BattleFrontier_BattleTowerCorridor/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor: @ 8485200
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
+2 -2
View File
@@ -1,8 +1,8 @@
BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50 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 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 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 BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0
map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleTowerElevator/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerElevator: @ 84851E4
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleTowerLobby/events.inc
+1 -1
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 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 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 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 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 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 object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0
data/maps/BattleFrontier_BattleTowerLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerLobby: @ 84851C8
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
+8 -8
View File
@@ -1,13 +1,13 @@
BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 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 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 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_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 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_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 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_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 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_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 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_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 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, 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 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, 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 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 BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C
map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 4 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=1, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_Lounge1/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge1: @ 84855B8
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_Lounge2/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge2: @ 84855F0
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_Lounge3/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge3: @ 848560C
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_Lounge4/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge4: @ 8485628
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_Lounge5/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge5: @ 8485660
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_Lounge6/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge6: @ 848567C
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_Lounge6/scripts.inc
+4 -4
View File
@@ -7,7 +7,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083 goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083
setvar VAR_0x8008, 3 setvar VAR_0x8008, 3
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
specialvar VAR_RESULT, sub_807E73C specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT copyvar VAR_0x8009, VAR_RESULT
msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO msgbox BattleFrontier_Lounge6_Text_26508D, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@@ -18,14 +18,14 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED
compare VAR_0x8004, 255 compare VAR_0x8004, 255
goto_if_eq BattleFrontier_Lounge6_EventScript_26506B goto_if_eq BattleFrontier_Lounge6_EventScript_26506B
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, sub_807E9D4 specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009 compare VAR_RESULT, VAR_0x8009
goto_if_ne BattleFrontier_Lounge6_EventScript_265075 goto_if_ne BattleFrontier_Lounge6_EventScript_265075
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
special sub_807EA10 special CreateInGameTradePokemon
special sub_807F0E4 special DoInGameTradeScene
waitstate waitstate
msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT
setflag FLAG_BATTLE_FRONTIER_TRADE_DONE setflag FLAG_BATTLE_FRONTIER_TRADE_DONE
data/maps/BattleFrontier_Lounge7/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge7: @ 8485698
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_Lounge8/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge8: @ 84856D0
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_Lounge9/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge9: @ 84856EC
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_Mart/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Mart: @ 8485740
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_OutsideEast/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_OutsideEast: @ 84852C4
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_ROUTE .byte MAP_TYPE_ROUTE
.2byte 0 .2byte 0
.byte 13 map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_OutsideWest/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_OutsideWest: @ 84851AC
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_ROUTE .byte MAP_TYPE_ROUTE
.2byte 0 .2byte 0
.byte 13 map_header_flags allow_bike=1, allow_escape_rope=0, allow_run=1, show_map_name=1
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL
data/maps/BattleFrontier_PokemonCenter_1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_PokemonCenter_1F: @ 8485708
.byte WEATHER_NONE .byte WEATHER_NONE
.byte MAP_TYPE_INDOOR .byte MAP_TYPE_INDOOR
.2byte 0 .2byte 0
.byte 0 map_header_flags allow_bike=0, allow_escape_rope=0, allow_run=0, show_map_name=0
.byte MAP_BATTLE_SCENE_NORMAL .byte MAP_BATTLE_SCENE_NORMAL

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