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

Merge branch 'master' of github.com:pret/pokeemerald into trade

Browse Source
This commit is contained in:
Diegoisawesome
2018-12-31 02:30:30 -06:00
parent ec780bb209 58f130d007
commit d004ce065c
779 changed files with 5227 additions and 8501 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 $asm = 0;
my $undocumented = 0;
while (my $line = <$file>)
{
if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/)
@@ -27,6 +28,13 @@ while (my $line = <$file>)
}
}
}
if($line =~ /^\s+0x([0-9A-f]+)\s+[A-z_]+([0-9A-f]+)/) {
my $thing1 = sprintf("%08X", hex($1));
my $thing2 = sprintf("%08X", hex($2));
if($thing1 eq $thing2) {
$undocumented += 1;
}
}
}
my $total = $src + $asm;
@@ -35,3 +43,4 @@ my $asmPct = sprintf("%.4f", 100 * $asm / $total);
print "$total total bytes of code\n";
print "$src bytes of code in src ($srcPct%)\n";
print "$asm bytes of code in asm ($asmPct%)\n";
print "$undocumented global symbols undocumented\n";
Makefile
+1 -2
View File
@@ -38,7 +38,7 @@ ASFLAGS := -mcpu=arm7tdmi
CC1 := tools/agbcc/bin/agbcc$(EXE)
override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include -nostdinc -undef
CPPFLAGS := -I tools/agbcc/include -I tools/agbcc -iquote include
LDFLAGS = -Map ../../$(MAP)
@@ -186,4 +186,3 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
$(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@
$(FIX) $@ -p -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
asm/battle_anim_effects_3.s
-1588
View File
File diff suppressed because it is too large Load Diff
asm/contest_link_80F57C4.s
+3 -3
View File
@@ -578,10 +578,10 @@ _080F5D58:
adds r0, r5, 0
movs r1, 0
bl VarSet
bl sub_8076D5C
bl SetContinueGameWarpStatusToDynamicWarp
movs r0, 0x1
bl TrySavingData
bl sav2_gender2_inplace_and_xFE
bl ClearContinueGameWarpStatus2
adds r0, r5, 0
adds r1, r4, 0
bl VarSet
@@ -5598,7 +5598,7 @@ _080F874C:
movs r3, 0x1
negs r3, r3
movs r0, 0
bl saved_warp2_set
bl SetDynamicWarp
bl ScriptContext2_Disable
bl EnableBothScriptContexts
_080F877E:
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
.space 2
.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
cmp r0, 0x6
bne _081D5FD2
bl sub_8087D74
bl InitMapFromSavedGame
b _081D605E
_081D5FD2:
bl sub_81D56B0
mov r0, r9
cmp r0, 0x5
bne _081D5FE6
bl sub_8087D74
bl InitMapFromSavedGame
bl sub_81D5710
b _081D605E
_081D5FE6:
@@ -29342,7 +29342,7 @@ _081D5FE6:
ldr r0, =gMapHeader
ldr r0, [r0]
ldr r2, [r0, 0xC]
ldr r1, =gUnknown_03005DC0
ldr r1, =gBackupMapLayout
str r4, [r1, 0x8]
movs r0, 0x1F
str r0, [r1]
asm/rom_8011DC0.s
+4 -4
View File
@@ -15686,7 +15686,7 @@ _0801EB04:
lsls r0, 24
cmp r0, 0
bne _0801EBC2
bl sub_8076D5C
bl SetContinueGameWarpStatusToDynamicWarp
movs r0, 0
bl TrySavingData
ldr r0, =gUnknown_02022C84
@@ -15713,7 +15713,7 @@ _0801EB40:
bne _0801EBC2
movs r0, 0x37
bl PlaySE
bl sav2_gender2_inplace_and_xFE
bl ClearContinueGameWarpStatus2
ldr r0, =gUnknown_02022C84
ldr r1, [r0]
movs r0, 0xA
@@ -20568,7 +20568,7 @@ _080211EC:
beq _080211F8
b _08021302
_080211F8:
bl sub_81971D0
bl InitStandardTextBoxWindows
bl sub_8197200
adds r0, r5, 0
bl sub_8022588
@@ -39128,7 +39128,7 @@ _0802A7CE:
movs r1, 0
movs r2, 0
bl ChangeBgY
bl sub_81971D0
bl InitStandardTextBoxWindows
bl sub_8197200
movs r1, 0x82
lsls r1, 5
asm/trainer_card.s
+2 -2
View File
@@ -4971,7 +4971,7 @@ _080C5204:
b _080C52C8
_080C5214:
str r4, [r0]
bl sav1_map_get_name
bl GetCurrentRegionMapSectionId
lsls r0, 24
lsrs r4, r0, 24
cmp r4, 0x3A
@@ -7780,7 +7780,7 @@ sub_80C6974: @ 80C6974
adds r1, r6
ldrb r1, [r1, 0xC]
bl StartSpriteAnim
bl sav1_map_get_name
bl GetCurrentRegionMapSectionId
lsls r0, 24
lsrs r5, r0, 24
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/misc_constants.inc"
.include "constants/global.inc"
.include "constants/contest_constants.inc"
.include "constants/pokemon_data_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 POKEMON_NAME_LENGTH, 11
.set MOVE_NAME_LENGTH, 13
.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_32x32, (OAM_SIZE_2 >> 28) | (OAM_SQUARE >> 14)
data/battle_anim_scripts.s
+17 -17
View File
@@ -3158,7 +3158,7 @@ Move_FORESIGHT:
monbg ANIM_DEF_PARTNER
monbgprio_28 ANIM_TARGET
setalpha 16, 0
createsprite gUnknown_085CE8C4, ANIM_TARGET, 2, 1
createsprite gForesightMagnifyingGlassSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET
delay 17
loopsewithpan SE_W166, SOUND_PAN_TARGET, 16, 4
delay 48
@@ -3540,12 +3540,12 @@ Move_SMELLING_SALT:
createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 0, 2
createsprite gUnknown_085CE864, ANIM_TARGET, 2, 1, 1, 2
delay 32
createvisualtask sub_815E840, 3, 1, 2
createvisualtask AnimTask_SmellingSaltSquish, 3, ANIM_TARGET, 2
loopsewithpan SE_W003, SOUND_PAN_TARGET, 12, 2
waitforvisualfinish
delay 4
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 6, 2
createsprite gUnknown_085CE894, ANIM_TARGET, 2, 1, 8, 3
createsprite gSmellingSaltExclamationSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 8, 3
loopsewithpan SE_W207B, SOUND_PAN_TARGET, 16, 3
end
@@ -3616,9 +3616,9 @@ Move_TAUNT:
Move_HELPING_HAND:
loadspritegfx ANIM_TAG_TAG_HAND
createvisualtask sub_815EC48, 5
createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 0
createsprite gUnknown_085CE8AC, ANIM_ATTACKER, 40, 1
createvisualtask AnimTask_HelpingHandAttackerMovement, 5
createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0
createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 1
delay 19
playsewithpan SE_W227, 0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1
@@ -3687,7 +3687,7 @@ Move_RECYCLE:
monbg ANIM_ATTACKER
setalpha 0, 16
delay 1
createsprite gUnknown_085CE9B0, ANIM_ATTACKER, 2
createsprite gRecycleSpriteTemplate, ANIM_ATTACKER, 2
loopsewithpan SE_W036, SOUND_PAN_ATTACKER, 24, 3
waitforvisualfinish
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB_WHITE, 12, 2, 1
@@ -3989,7 +3989,7 @@ Move_FEATHER_DANCE:
Move_TEETER_DANCE:
loadspritegfx ANIM_TAG_MUSIC_NOTES
loadspritegfx ANIM_TAG_DUCK
createvisualtask sub_8160164, 5
createvisualtask AnimTask_TeeterDanceMovement, 5
createsprite gUnknown_08593050, ANIM_ATTACKER, 2, 0, 16, -2
playsewithpan SE_W298, SOUND_PAN_ATTACKER
delay 24
@@ -4098,7 +4098,7 @@ Move_NEEDLE_ARM:
Move_SLACK_OFF:
loadspritegfx ANIM_TAG_BLUE_STAR
createvisualtask sub_8160544, 2, 0
createvisualtask AnimTask_SlackOffSquish, 2, ANIM_ATTACKER
playsewithpan SE_W281, SOUND_PAN_ATTACKER
waitforvisualfinish
call HealingEffect
@@ -4211,7 +4211,7 @@ Move_AIR_CUTTER:
Move_ODOR_SLEUTH:
monbg ANIM_TARGET
createvisualtask sub_815F620, 5
createvisualtask AnimTask_OdorSleuthMovement, 5
delay 24
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 3, 4
playsewithpan SE_W207, SOUND_PAN_ATTACKER
@@ -4365,7 +4365,7 @@ Move_IRON_DEFENSE:
Move_BLOCK:
loadspritegfx ANIM_TAG_X_SIGN
createsprite gUnknown_085CE90C, ANIM_TARGET, 66
createsprite gBlockXSpriteTemplate, ANIM_TARGET, 66
playsewithpan SE_W207, SOUND_PAN_TARGET
end
@@ -8718,12 +8718,12 @@ Move_METEOR_MASH:
fadetobg BG_COSMIC
waitbgfadein
waitforvisualfinish
createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -48, SOUND_PAN_ATTACKER, 72, 32, 30
createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -48, -64, 72, 32, 30
delay 10
createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -112, SOUND_PAN_ATTACKER, 8, 32, 30
createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -112, -64, 8, 32, 30
delay 40
createsprite gUnknown_08595F14, ANIM_TARGET, 3, 0, 0, 0, 30
createsprite gUnknown_085CE8DC, ANIM_TARGET, 3, -80, SOUND_PAN_ATTACKER, 40, 32, 30
createsprite gMeteorMashStarSpriteTemplate, ANIM_TARGET, 3, -80, -64, 40, 32, 30
delay 20
playsewithpan SE_W233B, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
@@ -9551,7 +9551,7 @@ Move_KNOCK_OFF:
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
delay 4
playsewithpan SE_W233, SOUND_PAN_TARGET
createsprite gUnknown_085CE984, ANIM_TARGET, 2, -16, -16
createsprite gKnockOffStrikeSpriteTemplate, ANIM_TARGET, 2, -16, -16
delay 8
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2
@@ -10556,11 +10556,11 @@ SnatchMoveContinue:
end
SnatchOpposingMonMove:
playsewithpan SE_W104, SOUND_PAN_ATTACKER
createvisualtask sub_815F8F4, 2
createvisualtask AnimTask_SnatchOpposingMonMove, 2
goto SnatchMoveContinue
SnatchPartnerMonMove:
playsewithpan SE_W104, SOUND_PAN_ATTACKER
createvisualtask sub_815FFC4, 2
createvisualtask AnimTask_SnatchPartnerMove, 2
goto SnatchMoveContinue
General_FutureSightHit:
data/event_scripts.s
+17 -16
View File
@@ -1,3 +1,4 @@
#include "constants/global.h"
#include "constants/battle_frontier.h"
#include "constants/battle_setup.h"
#include "constants/event_objects.h"
@@ -1088,7 +1089,7 @@ EventScript_2715DE:: @ 82715DE
setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
setflag FLAG_HIDE_ROUTE_111_DESERT_FOSSIL
setflag FLAG_HIDE_ROUTE_111_DESERT_RIVAL
setflag FLAG_HIDE_ROUTE_111_PLAYER_DESCENT
setflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
setflag FLAG_HIDE_MOSSDEEP_CITY_TEAM_MAGMA
setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA
@@ -1792,52 +1793,52 @@ Route110_EventScript_271ED7:: @ 8271ED7
Route119_EventScript_271ED7:: @ 8271ED7
RustboroCity_EventScript_271ED7:: @ 8271ED7
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq RustboroCity_EventScript_271EEF
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq RustboroCity_EventScript_271EF5
end
RustboroCity_EventScript_271EEF:: @ 8271EEF
setvar VAR_OBJ_GFX_ID_0, 105
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
RustboroCity_EventScript_271EF5:: @ 8271EF5
setvar VAR_OBJ_GFX_ID_0, 100
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
LavaridgeTown_EventScript_271EFB:: @ 8271EFB
Route110_EventScript_271EFB:: @ 8271EFB
Route119_EventScript_271EFB:: @ 8271EFB
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq LavaridgeTown_EventScript_271F13
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq LavaridgeTown_EventScript_271F19
end
LavaridgeTown_EventScript_271F13:: @ 8271F13
setvar VAR_OBJ_GFX_ID_3, 106
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE
return
LavaridgeTown_EventScript_271F19:: @ 8271F19
setvar VAR_OBJ_GFX_ID_3, 101
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
return
EventScript_271F1F:: @ 8271F1F
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq EventScript_271F37
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq EventScript_271F3D
end
EventScript_271F37:: @ 8271F37
setvar VAR_OBJ_GFX_ID_0, 100
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
EventScript_271F3D:: @ 8271F3D
setvar VAR_OBJ_GFX_ID_0, 105
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
DewfordTown_Gym_EventScript_271F43:: @ 8271F43
@@ -4768,7 +4769,7 @@ gUnknown_082A8350:: @ 82A8350
waitmovement 0
playse SE_RU_HYUU
delay 60
special sp13F_fall_to_last_warp
special DoFallWarp
waitstate
end
@@ -8977,8 +8978,8 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_2C3EDE: @ 82C3EDE
.2byte 0
BattleFrontier_BattlePikeRandomRoom1_EventScript_2C3EE8:: @ 82C3EE8
setvar VAR_OBJ_GFX_ID_1, 28
setvar VAR_OBJ_GFX_ID_0, 28
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LINK_RECEPTIONIST
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_LINK_RECEPTIONIST
setvar VAR_0x8004, 5
special CallBattlePikeFunction
compare VAR_RESULT, 3
data/field_effect_scripts.s
+1 -1
View File
@@ -341,5 +341,5 @@ gFieldEffectScript_Unknown65:: @ 82DBCF9
field_eff_end
gFieldEffectScript_Unknown66:: @ 82DBCFF
field_eff_callnative sub_80B9E28
field_eff_callnative Fldeff_MoveDeoxysRock
field_eff_end
data/layouts.inc
+1 -1
View File
@@ -389,7 +389,7 @@
.include "data/layouts/DesertUnderpass/layout.inc"
.include "data/layouts/BattleFrontier_BattleTowerMultiBattleRoom/layout.inc"
.include "data/layouts/BattleFrontier_BattleTowerCorridor2/layout.inc"
.include "data/layouts/UnknownMap_08470BD8/layout.inc"
.include "data/layouts/Route111_NoMirageTower/layout.inc"
.include "data/layouts/UnionRoom/layout.inc"
.include "data/layouts/SafariZone_Northeast/layout.inc"
.include "data/layouts/SafariZone_Southeast/layout.inc"
data/layouts/UnknownMap_08470BD8/border.bin → data/layouts/Route111_NoMirageTower/border.bin
View File
data/layouts/Route111_NoMirageTower/layout.inc
+15
View File
@@ -0,0 +1,15 @@
Route111_NoMirageTower_MapBorder::
.incbin "data/layouts/Route111_NoMirageTower/border.bin"
Route111_NoMirageTower_MapBlockdata::
.incbin "data/layouts/Route111_NoMirageTower/map.bin"
.align 2
Route111_NoMirageTower_Layout::
.4byte 0x28
.4byte 0x8C
.4byte Route111_NoMirageTower_MapBorder
.4byte Route111_NoMirageTower_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Mauville
data/layouts/UnknownMap_08470BD8/map.bin → data/layouts/Route111_NoMirageTower/map.bin
View File
data/layouts/UnknownMap_08470BD8/layout.inc
-15
View File
@@ -1,15 +0,0 @@
UnknownMap_08470BD8_MapBorder::
.incbin "data/layouts/UnknownMap_08470BD8/border.bin"
UnknownMap_08470BD8_MapBlockdata::
.incbin "data/layouts/UnknownMap_08470BD8/map.bin"
.align 2
UnknownMap_08470BD8_Layout::
.4byte 0x28
.4byte 0x8C
.4byte UnknownMap_08470BD8_MapBorder
.4byte UnknownMap_08470BD8_MapBlockdata
.4byte gTileset_General
.4byte gTileset_Mauville
data/layouts_table.inc
+1 -1
View File
@@ -391,7 +391,7 @@ gMapLayouts::
.4byte DesertUnderpass_Layout
.4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout
.4byte BattleFrontier_BattleTowerCorridor2_Layout
.4byte UnknownMap_08470BD8_Layout
.4byte Route111_NoMirageTower_Layout
.4byte UnionRoom_Layout
.4byte SafariZone_Northeast_Layout
.4byte SafariZone_Southeast_Layout
data/maps/AbandonedShip_CaptainsOffice/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_CaptainsOffice: @ 84845A4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AbandonedShip_Corridors_1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Corridors_1F: @ 84844C4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AbandonedShip_Corridors_B1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Corridors_B1F: @ 84844FC
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AbandonedShip_Deck/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Deck: @ 84844A8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AbandonedShip_Room_B1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Room_B1F: @ 848456C
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AbandonedShip_Rooms2_1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Rooms2_1F: @ 8484588
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AbandonedShip_Rooms2_B1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Rooms2_B1F: @ 8484534
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AbandonedShip_Rooms_1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Rooms_1F: @ 84844E0
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AbandonedShip_Rooms_B1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Rooms_B1F: @ 8484518
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AbandonedShip_Underwater1/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Underwater1: @ 8484550
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.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
data/maps/AbandonedShip_Underwater2/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AbandonedShip_Underwater2: @ 84845C0
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.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
data/maps/AlteringCave/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AlteringCave: @ 8484A58
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AncientTomb/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AncientTomb: @ 8484630
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AquaHideout_1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AquaHideout_1F: @ 8484144
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/AquaHideout_B1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AquaHideout_B1F: @ 8484160
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/AquaHideout_B2F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AquaHideout_B2F: @ 848417C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/AquaHideout_UnusedRubyMap1/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap1: @ 84846D8
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AquaHideout_UnusedRubyMap2/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap2: @ 84846F4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/AquaHideout_UnusedRubyMap3/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ AquaHideout_UnusedRubyMap3: @ 8484710
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/ArtisanCave_1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ ArtisanCave_1F: @ 84849B0
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.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
data/maps/ArtisanCave_B1F/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ ArtisanCave_B1F: @ 8484994
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.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
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 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4
data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+4 -4
View File
@@ -17,18 +17,18 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC
return
BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6:: @ 82574C6
setvar VAR_OBJ_GFX_ID_1, 100
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC:: @ 82574CC
setvar VAR_OBJ_GFX_ID_1, 105
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
BattleFrontier_BattleArenaBattleRoom_MapScript2_2574D2: @ 82574D2
data/maps/BattleFrontier_BattleArenaCorridor/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaCorridor: @ 8485468
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleArenaLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleArenaLobby: @ 848544C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
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 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 4, 9, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
object_event 15, EVENT_OBJ_GFX_VAR_0, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+4 -4
View File
@@ -20,18 +20,18 @@ BattleFrontier_BattleDomeBattleRoom_MapScript1_24BCB1: @ 824BCB1
BattleFrontier_BattleArenaBattleRoom_EventScript_24BCDC:: @ 824BCDC
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCDC:: @ 824BCDC
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCF4:: @ 824BCF4
setvar VAR_OBJ_GFX_ID_1, 100
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
BattleFrontier_BattleDomeBattleRoom_EventScript_24BCFA:: @ 824BCFA
setvar VAR_OBJ_GFX_ID_1, 105
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
BattleFrontier_BattleDomeBattleRoom_MapScript2_24BD00: @ 824BD00
data/maps/BattleFrontier_BattleDomeCorridor/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeCorridor: @ 8485350
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleDomeLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomeLobby: @ 8485334
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc
+2 -2
View File
@@ -1,12 +1,12 @@
BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 8, 255, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_VAR_F, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+4 -4
View File
@@ -8,9 +8,9 @@ BattleFrontier_BattleFactoryBattleRoom_MapScript1_25ADBB: @ 825ADBB
setvar VAR_0x8004, 5
special CallFrontierUtilFunc
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B
setvar VAR_0x8004, 9
special CallFrontierUtilFunc
@@ -39,11 +39,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE24:: @ 825AE24
end
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE25:: @ 825AE25
setvar VAR_OBJ_GFX_ID_F, 100
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
BattleFrontier_BattleFactoryBattleRoom_EventScript_25AE2B:: @ 825AE2B
setvar VAR_OBJ_GFX_ID_F, 105
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
BattleFrontier_BattleFactoryBattleRoom_MapScript2_25AE31: @ 825AE31
data/maps/BattleFrontier_BattleFactoryLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc
+2 -2
View File
@@ -1,6 +1,6 @@
BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+6 -6
View File
@@ -12,20 +12,20 @@ BattleFrontier_BattlePalaceBattleRoom_MapScript1_24F825: @ 824F825
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F833:: @ 824F833
checkplayergender
compare VAR_RESULT, 0
compare VAR_RESULT, MALE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B
compare VAR_RESULT, 1
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856
return
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F84B:: @ 824F84B
setvar VAR_OBJ_GFX_ID_1, 100
setvar VAR_OBJ_GFX_ID_0, 100
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
return
BattleFrontier_BattlePalaceBattleRoom_EventScript_24F856:: @ 824F856
setvar VAR_OBJ_GFX_ID_1, 105
setvar VAR_OBJ_GFX_ID_0, 105
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
return
BattleFrontier_BattlePalaceBattleRoom_MapScript2_24F861: @ 824F861
data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattlePalaceLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattlePikeCorridor/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeCorridor: @ 8485510
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattlePikeLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeLobby: @ 84854F4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc
+2 -2
View File
@@ -1,6 +1,6 @@
BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattlePyramidLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattlePyramidTop/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattlePyramidTop: @ 8485430
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc
+1 -1
View File
@@ -1,5 +1,5 @@
BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc
+4 -4
View File
@@ -1,10 +1,10 @@
BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 5, 255, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 6, 254, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
object_event 5, EVENT_OBJ_GFX_VAR_F, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_VAR_E, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0
BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054
map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleTowerBattleRoom2/scripts.inc
+2 -2
View File
@@ -17,11 +17,11 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_248F0F:: @ 8248F0F
checkplayergender
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29
setvar VAR_OBJ_GFX_ID_F, 0
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F29:: @ 8248F29
setvar VAR_OBJ_GFX_ID_F, 89
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
return
BattleFrontier_BattleTowerBattleRoom2_EventScript_248F2F:: @ 8248F2F
data/maps/BattleFrontier_BattleTowerCorridor/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor: @ 8485200
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleTowerCorridor2/events.inc
+2 -2
View File
@@ -1,8 +1,8 @@
BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50
object_event 1, 255, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 4, 254, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_VAR_E, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0
map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleTowerCorridor2/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerCorridor2: @ 84852FC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
+2 -2
View File
@@ -17,11 +17,11 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248D71:: @ 8248D71
checkplayergender
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerCorridor2_EventScript_248D8B
setvar VAR_OBJ_GFX_ID_F, 0
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_BRENDAN_NORMAL
return
BattleFrontier_BattleTowerCorridor2_EventScript_248D8B:: @ 8248D8B
setvar VAR_OBJ_GFX_ID_F, 89
setvar VAR_OBJ_GFX_ID_F, EVENT_OBJ_GFX_MAY_NORMAL
return
BattleFrontier_BattleTowerCorridor2_EventScript_248D91:: @ 8248D91
data/maps/BattleFrontier_BattleTowerElevator/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerElevator: @ 84851E4
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
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 4, EVENT_OBJ_GFX_BOY_1, 0, 15, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0
object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, FLAG_HIDE_BATTLE_TOWER_REPORTER
object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE
object_event 6, EVENT_OBJ_GFX_VAR_0, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EventScript_Apprentice, FLAG_HIDE_APPRENTICE
object_event 7, EVENT_OBJ_GFX_TEALA, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0
object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0
object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0
data/maps/BattleFrontier_BattleTowerLobby/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerLobby: @ 84851C8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc
+8 -8
View File
@@ -1,13 +1,13 @@
BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
object_event 3, EVENT_OBJ_GFX_TRADER, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4
object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5
object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
object_event 8, 246, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
object_event 9, 247, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3
object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 8, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_4
object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_5
object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_6
object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1
object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2
BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C
map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+8 -8
View File
@@ -25,14 +25,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0
end
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA:: @ 8243DDA
setvar VAR_OBJ_GFX_ID_0, 7
setvar VAR_OBJ_GFX_ID_1, 7
setvar VAR_OBJ_GFX_ID_2, 7
setvar VAR_OBJ_GFX_ID_3, 7
setvar VAR_OBJ_GFX_ID_4, 7
setvar VAR_OBJ_GFX_ID_5, 7
setvar VAR_OBJ_GFX_ID_6, 7
setvar VAR_OBJ_GFX_ID_7, 7
setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_BOY_1
setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_BOY_1
setvar VAR_TEMP_1, 1
setvar VAR_TEMP_3, 1
setobjectxyperm 1, 10, 2
data/maps/BattleFrontier_Lounge1/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge1: @ 84855B8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_Lounge2/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge2: @ 84855F0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_Lounge3/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge3: @ 848560C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_Lounge4/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge4: @ 8485628
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_Lounge5/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge5: @ 8485660
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_Lounge6/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge6: @ 848567C
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_Lounge7/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge7: @ 8485698
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_Lounge8/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge8: @ 84856D0
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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
data/maps/BattleFrontier_Lounge9/header.inc
+1 -1
View File
@@ -10,6 +10,6 @@ BattleFrontier_Lounge9: @ 84856EC
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.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

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