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

Browse Source
This commit is contained in:
Diegoisawesome
2018-07-24 21:18:36 -07:00
parent 156fb472e1 5883f867f0
commit e92e2cb0aa
1092 changed files with 39655 additions and 38981 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
data/battle_ai_scripts.s
View File

@@ -3382,11 +3382,11 @@ AI_Safari_Flee:
flee
AI_FirstBattle:
if_hp_equal AI_TARGET, 20, BattleAIScript_82DE34D
if_hp_less_than AI_TARGET, 20, BattleAIScript_82DE34D
if_hp_equal AI_TARGET, 20, AI_FirstBattle_Flee
if_hp_less_than AI_TARGET, 20, AI_FirstBattle_Flee
end
BattleAIScript_82DE34D:
AI_FirstBattle_Flee:
flee
AI_Ret:

7
data/battle_frontier_2.s
View File

@@ -1,5 +1,6 @@
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
@@ -1049,8 +1050,10 @@ gUnknown_08611D08:: @ 8611D08
.4byte gUnknown_085EE3C4
.align 1
gUnknown_08611D30:: @ 8611D30
.2byte 0x0325, 0x0326, 0x0327, 0x0328, 0x0329, 0x032a, 0x032b, 0x0000
gFacilityToBrainTrainerId:: @ 8611D30
.2byte TRAINER_ANABEL, TRAINER_TUCKER, TRAINER_SPENSER
.2byte TRAINER_GRETA, TRAINER_NOLAND, TRAINER_LUCY
.2byte TRAINER_BRANDON
.align 2
gUnknown_08611D40:: @ 8611D40

32
data/battle_scripts_1.s
View File

@@ -2873,7 +2873,7 @@ BattleScript_FaintedMonTryChooseAnother::
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_x2000000, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_FaintedMonChooseAnother
jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother
jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
jumpifbyte CMP_EQUAL, sBATTLE_STYLE, 0x1, BattleScript_FaintedMonChooseAnother
@@ -2899,7 +2899,7 @@ BattleScript_FaintedMonTryChooseAnother::
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
printstring STRINGID_SWITCHINMON
atk62 BS_ATTACKER
hidepartystatussummary BS_ATTACKER
switchinanim BS_ATTACKER, 0x0
waitstate
switchineffects BS_ATTACKER
@@ -2910,7 +2910,7 @@ BattleScript_FaintedMonChooseAnother::
switchindataupdate BS_FAINTED
hpthresholds BS_FAINTED
printstring STRINGID_SWITCHINMON
atk62 BS_FAINTED
hidepartystatussummary BS_FAINTED
switchinanim BS_FAINTED, FALSE
waitstate
various7 BS_ATTACKER
@@ -2933,7 +2933,7 @@ BattleScript_82DA908::
switchindataupdate BS_FAINTED
hpthresholds BS_FAINTED
printstring STRINGID_SWITCHINMON
atk62 BS_FAINTED
hidepartystatussummary BS_FAINTED
switchinanim BS_FAINTED, FALSE
waitstate
switchineffects 5
@@ -2968,7 +2968,7 @@ BattleScript_PayDayMoneyAndPickUpItems::
BattleScript_LocalBattleLost::
jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew
jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd
jumpifhalfword CMP_EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd
@@ -3120,10 +3120,10 @@ BattleScript_PursuitSwitchDmgSetMultihit::
setmultihit 0x2
BattleScript_PursuitSwitchDmgLoop::
jumpifnopursuitswitchdmg BattleScript_DoSwitchOut
atk5F
swapattackerwithtarget
trysetdestinybondtohappen
call BattleScript_PursuitDmgOnSwitchOut
atk5F
swapattackerwithtarget
BattleScript_DoSwitchOut::
decrementmultihit BattleScript_PursuitSwitchDmgLoop
switchoutabilities BS_ATTACKER
@@ -3136,7 +3136,7 @@ BattleScript_DoSwitchOut::
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
printstring STRINGID_SWITCHINMON
atk62 BS_ATTACKER
hidepartystatussummary BS_ATTACKER
switchinanim BS_ATTACKER, FALSE
waitstate
switchineffects BS_ATTACKER
@@ -3230,7 +3230,7 @@ BattleScript_DamagingWeatherContinues::
playanimation2 BS_ATTACKER, sB_ANIM_ARG1, NULL
setbyte gBattleCommunication, 0x0
BattleScript_DamagingWeatherLoop::
copyarraywithindex gBattlerAttacker, gBattleTurnOrder, gBattleCommunication, 0x1
copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattleCommunication, 0x1
weatherdamage
jumpifword CMP_EQUAL, gBattleMoveDamage, 0x0, BattleScript_DamagingWeatherLoopIncrement
printfromtable gSandStormHailDmgStringIds
@@ -3710,12 +3710,12 @@ BattleScript_MagicCoatBounce::
BattleScript_SnatchedMove::
attackstring
ppreduce
snatchsetbanks
snatchsetbattlers
playanimation BS_TARGET, B_ANIM_SNATCH_MOVE, NULL
printstring STRINGID_PKMNSNATCHEDMOVE
waitmessage 0x40
orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000
atk5F
swapattackerwithtarget
return
BattleScript_EnduredMsg::
@@ -3991,7 +3991,7 @@ BattleScript_DrizzleActivates::
pause 0x20
printstring STRINGID_PKMNMADEITRAIN
waitstate
playanimation BS_BANK_0, B_ANIM_RAIN_CONTINUES, NULL
playanimation BS_BATTLER_0, B_ANIM_RAIN_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4019,7 +4019,7 @@ BattleScript_SandstreamActivates::
pause 0x20
printstring STRINGID_PKMNSXWHIPPEDUPSANDSTORM
waitstate
playanimation BS_BANK_0, B_ANIM_SANDSTORM_CONTINUES, NULL
playanimation BS_BATTLER_0, B_ANIM_SANDSTORM_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4085,7 +4085,7 @@ BattleScript_DroughtActivates::
pause 0x20
printstring STRINGID_PKMNSXINTENSIFIEDSUN
waitstate
playanimation BS_BANK_0, B_ANIM_SUN_CONTINUES, NULL
playanimation BS_BATTLER_0, B_ANIM_SUN_CONTINUES, NULL
call BattleScript_WeatherFormChanges
end3
@@ -4561,8 +4561,8 @@ BattleScript_82DB973::
end2
BattleScript_82DB992::
various16 BS_BANK_0
various17 BS_BANK_0
various16 BS_BATTLER_0
various17 BS_BATTLER_0
various9 BS_ATTACKER
various15 BS_ATTACKER
printstring STRINGID_TIEDOPPONENTBYREFEREE

10
data/battle_scripts_2.s
View File

@@ -44,7 +44,7 @@ gBattlescriptsForSafariActions:: @ 82DBD58
.4byte BattleScript_ActionWatchesCarefully
.4byte BattleScript_ActionGetNear
.4byte BattleScript_ActionThrowPokeblock
.4byte BattleScript_82DBEE3
.4byte BattleScript_ActionWallyThrow
BattleScript_BallThrow::
jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally
@@ -176,17 +176,17 @@ BattleScript_RunByUsingItem::
setbyte gBattleOutcome, B_OUTCOME_RAN
finishturn
BattleScript_ActionWatchesCarefully::
BattleScript_ActionWatchesCarefully:
printstring STRINGID_PKMNWATCHINGCAREFULLY
waitmessage 0x40
end2
BattleScript_ActionGetNear::
BattleScript_ActionGetNear:
printfromtable gSafariGetNearStringIds
waitmessage 0x40
end2
BattleScript_ActionThrowPokeblock::
BattleScript_ActionThrowPokeblock:
printstring STRINGID_THREWPOKEBLOCKATPKMN
waitmessage 0x40
playanimation BS_ATTACKER, B_ANIM_x4, NULL
@@ -194,7 +194,7 @@ BattleScript_ActionThrowPokeblock::
waitmessage 0x40
end2
BattleScript_82DBEE3::
BattleScript_ActionWallyThrow:
printstring STRINGID_RETURNMON
waitmessage 0x40
returnatktoball

238
data/data2b.s
View File

@@ -235,7 +235,7 @@ gUnknown_082FF704:: @ 82FF704
.2byte 0x0003, 0x0000, 0xffff, 0x0000
.align 2
gUnknown_082FF70C:: @ 82FF70C
gPlayerMonSpriteAnimsTable:: @ 82FF70C
.4byte gUnknown_082FF6EC
.4byte gUnknown_082FF6F4
.4byte gUnknown_082FF6FC
@@ -4630,239 +4630,3 @@ gUnknown_08305D0C:: @ 8305D0C
.4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888
.4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888
.4byte 0x00000888, 0x00000888, 0x00000888, 0x00000888
@ 830B62C
.include "data/trainer_parties.inc"
@ 830FCD4
.include "data/text/trainer_class_names.inc"
@ 8310030
.include "data/trainers.inc"
@ 83185C8
.include "data/text/species_names.inc"
@ 831977C
.include "data/text/move_names.inc"
.align 2
.2byte 0x0300, 0x0000
.align 2
gUnknown_0831A988:: @ 831A988
.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0831A990:: @ 831A990
.byte 0x00, 0x03, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00
.align 2
gUnknown_0831A998:: @ 831A998
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0831A9A8:: @ 831A9A8
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0018, 0x0018, 0x8000, 0x0000
.2byte 0x0018, 0x0018, 0x8000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0831A9C8:: @ 831A9C8
.4byte gUnknown_0831A998
.4byte gUnknown_0831A9A8
.align 2
gUnknown_0831A9D0:: @ 831A9D0
spr_template 0x2710, 0x2710, gUnknown_0831A988, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
.align 2
gUnknown_0831A9E8:: @ 831A9E8
spr_template 0x2710, 0x2710, gUnknown_0831A990, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
.align 2
gUnknown_0831AA00:: @ 831AA00
obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710
.align 2
gUnknown_0831AA08:: @ 831AA08
.4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab
.align 2
gUnknown_0831AA18:: @ 831AA18
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
window_template 0x01, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0020
window_template 0x02, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0040
window_template 0x01, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0020
window_template 0x02, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0040
window_template 0x01, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0060
window_template 0x02, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0080
window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
null_window_template
.align 2
gUnknown_0831AAE0:: @ 831AAE0
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
window_template 0x00, 0x06, 0x01, 0x08, 0x02, 0x05, 0x0100
window_template 0x00, 0x0e, 0x01, 0x02, 0x02, 0x05, 0x0110
window_template 0x00, 0x10, 0x01, 0x08, 0x02, 0x05, 0x0114
window_template 0x00, 0x0c, 0x04, 0x06, 0x02, 0x05, 0x0124
window_template 0x00, 0x0c, 0x06, 0x06, 0x02, 0x05, 0x0130
window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
null_window_template
.align 2
gUnknown_0831ABA0:: @ 831ABA0
.4byte gUnknown_0831AA18
.4byte gUnknown_0831AAE0
.align 2
gBattleTerrainTable:: @ 831ABA8
@ tall_grass
.4byte gBattleTerrainTiles_TallGrass
.4byte gBattleTerrainTilemap_TallGrass
.4byte gBattleTerrainAnimTiles_TallGrass
.4byte gBattleTerrainAnimTilemap_TallGrass
.4byte gBattleTerrainPalette_TallGrass
@ long_grass
.4byte gBattleTerrainTiles_LongGrass
.4byte gBattleTerrainTilemap_LongGrass
.4byte gBattleTerrainAnimTiles_LongGrass
.4byte gBattleTerrainAnimTilemap_LongGrass
.4byte gBattleTerrainPalette_LongGrass
@ sand
.4byte gBattleTerrainTiles_Sand
.4byte gBattleTerrainTilemap_Sand
.4byte gBattleTerrainAnimTiles_Sand
.4byte gBattleTerrainAnimTilemap_Sand
.4byte gBattleTerrainPalette_Sand
@ underwater
.4byte gBattleTerrainTiles_Underwater
.4byte gBattleTerrainTilemap_Underwater
.4byte gBattleTerrainAnimTiles_Underwater
.4byte gBattleTerrainAnimTilemap_Underwater
.4byte gBattleTerrainPalette_Underwater
@ water
.4byte gBattleTerrainTiles_Water
.4byte gBattleTerrainTilemap_Water
.4byte gBattleTerrainAnimTiles_Water
.4byte gBattleTerrainAnimTilemap_Water
.4byte gBattleTerrainPalette_Water
@ pond_water
.4byte gBattleTerrainTiles_PondWater
.4byte gBattleTerrainTilemap_PondWater
.4byte gBattleTerrainAnimTiles_PondWater
.4byte gBattleTerrainAnimTilemap_PondWater
.4byte gBattleTerrainPalette_PondWater
@ rock
.4byte gBattleTerrainTiles_Rock
.4byte gBattleTerrainTilemap_Rock
.4byte gBattleTerrainAnimTiles_Rock
.4byte gBattleTerrainAnimTilemap_Rock
.4byte gBattleTerrainPalette_Rock
@ cave
.4byte gBattleTerrainTiles_Cave
.4byte gBattleTerrainTilemap_Cave
.4byte gBattleTerrainAnimTiles_Cave
.4byte gBattleTerrainAnimTilemap_Cave
.4byte gBattleTerrainPalette_Cave
@ building
.4byte gBattleTerrainTiles_Building
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Building
@ plain
.4byte gBattleTerrainTiles_Building
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Plain
.align 2
gUnknown_0831AC70:: @ 831AC70
.4byte REG_BG3HOFS
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
.4byte 1
.4byte REG_BG3HOFS
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
.4byte 1
.align 2
gUnknown_0831AC88:: @ 831AC88
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8038528
gText_ShedinjaJapaneseName:: @ 831ACA0
.string "ヌケニン$" @ Nukenin
.align 2
gUnknown_0831ACA8:: @ 831ACA8
.2byte 0x0100
.2byte 0xC000
.2byte 0x0800
.align 2
gUnknown_0831ACB0:: @ 831ACB0
.2byte 0x0100
.2byte 0xC000
.2byte 0x2800
.align 2
gUnknown_0831ACB8:: @ 831ACB8
.2byte 0x0000, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_0831ACC0:: @ 831ACC0
.4byte gUnknown_0831ACB8
.align 2
gUnknown_0831ACC4:: @ 831ACC4
.2byte 0xfff0, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x3c00, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
.align 2
gUnknown_0831ACDC:: @ 831ACDC
.4byte gUnknown_0831ACC4
.align 2
gUnknown_0831ACE0:: @ 831ACE0
.byte 0xe0, 0xf0, 0xf0, 0xe0, 0xe0, 0x00, 0x00, 0x00

226
data/data2c.s Normal file
View File

@@ -0,0 +1,226 @@
#include "constants/items.h"
#include "constants/moves.h"
#include "constants/species.h"
#include "constants/trainers.h"
#include "constants/pokemon.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
.2byte 0x0300, 0x0000
.align 2
gUnknown_0831A988:: @ 831A988
.byte 0x00, 0x03, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_0831A990:: @ 831A990
.byte 0x00, 0x03, 0x00, 0xc0, 0x40, 0x00, 0x00, 0x00
.align 2
gUnknown_0831A998:: @ 831A998
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0831A9A8:: @ 831A9A8
.2byte 0x0080, 0x0080, 0x0000, 0x0000, 0x0018, 0x0018, 0x8000, 0x0000
.2byte 0x0018, 0x0018, 0x8000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0831A9C8:: @ 831A9C8
.4byte gUnknown_0831A998
.4byte gUnknown_0831A9A8
.align 2
gUnknown_0831A9D0:: @ 831A9D0
spr_template 0x2710, 0x2710, gUnknown_0831A988, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
.align 2
gUnknown_0831A9E8:: @ 831A9E8
spr_template 0x2710, 0x2710, gUnknown_0831A990, gDummySpriteAnimTable, NULL, gUnknown_0831A9C8, nullsub_17
.align 2
gUnknown_0831AA00:: @ 831AA00
obj_tiles gUnknown_08D77B0C, 0x1000, 0x2710
.align 2
gBattleBgTemplates:: @ 831AA08
.4byte 0x00000580, 0x000005c5, 0x000013e6, 0x000033ab
.align 2
gUnknown_0831AA18:: @ 831AA18
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
window_template 0x01, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0020
window_template 0x02, 0x02, 0x03, 0x06, 0x02, 0x05, 0x0040
window_template 0x01, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0020
window_template 0x02, 0x02, 0x02, 0x06, 0x02, 0x05, 0x0040
window_template 0x01, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0060
window_template 0x02, 0x02, 0x06, 0x06, 0x02, 0x05, 0x0080
window_template 0x00, 0x0c, 0x02, 0x06, 0x02, 0x00, 0x00a0
window_template 0x00, 0x04, 0x02, 0x07, 0x02, 0x00, 0x00a0
window_template 0x00, 0x13, 0x02, 0x07, 0x02, 0x00, 0x00b0
null_window_template
.align 2
gUnknown_0831AAE0:: @ 831AAE0
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x00, 0x0090
window_template 0x00, 0x01, 0x23, 0x0e, 0x04, 0x00, 0x01c0
window_template 0x00, 0x11, 0x23, 0x0c, 0x04, 0x05, 0x0190
window_template 0x00, 0x02, 0x37, 0x08, 0x02, 0x05, 0x0300
window_template 0x00, 0x0b, 0x37, 0x08, 0x02, 0x05, 0x0310
window_template 0x00, 0x02, 0x39, 0x08, 0x02, 0x05, 0x0320
window_template 0x00, 0x0b, 0x39, 0x08, 0x02, 0x05, 0x0330
window_template 0x00, 0x15, 0x37, 0x04, 0x02, 0x05, 0x0290
window_template 0x00, 0x15, 0x39, 0x00, 0x00, 0x05, 0x0298
window_template 0x00, 0x19, 0x37, 0x04, 0x02, 0x05, 0x0298
window_template 0x00, 0x15, 0x39, 0x08, 0x02, 0x05, 0x02a0
window_template 0x00, 0x15, 0x37, 0x08, 0x04, 0x05, 0x02b0
window_template 0x00, 0x1a, 0x09, 0x03, 0x04, 0x05, 0x0100
window_template 0x01, 0x13, 0x08, 0x0a, 0x0b, 0x05, 0x0100
window_template 0x02, 0x12, 0x00, 0x0c, 0x03, 0x06, 0x016e
window_template 0x00, 0x06, 0x01, 0x08, 0x02, 0x05, 0x0100
window_template 0x00, 0x0e, 0x01, 0x02, 0x02, 0x05, 0x0110
window_template 0x00, 0x10, 0x01, 0x08, 0x02, 0x05, 0x0114
window_template 0x00, 0x0c, 0x04, 0x06, 0x02, 0x05, 0x0124
window_template 0x00, 0x0c, 0x06, 0x06, 0x02, 0x05, 0x0130
window_template 0x00, 0x0c, 0x08, 0x06, 0x02, 0x05, 0x013c
window_template 0x00, 0x08, 0x0b, 0x0e, 0x02, 0x05, 0x0148
window_template 0x00, 0x02, 0x0f, 0x1a, 0x04, 0x07, 0x0090
null_window_template
.align 2
gBattleWindowTemplates:: @ 831ABA0
.4byte gUnknown_0831AA18
.4byte gUnknown_0831AAE0
.align 2
gBattleTerrainTable:: @ 831ABA8
@ tall_grass
.4byte gBattleTerrainTiles_TallGrass
.4byte gBattleTerrainTilemap_TallGrass
.4byte gBattleTerrainAnimTiles_TallGrass
.4byte gBattleTerrainAnimTilemap_TallGrass
.4byte gBattleTerrainPalette_TallGrass
@ long_grass
.4byte gBattleTerrainTiles_LongGrass
.4byte gBattleTerrainTilemap_LongGrass
.4byte gBattleTerrainAnimTiles_LongGrass
.4byte gBattleTerrainAnimTilemap_LongGrass
.4byte gBattleTerrainPalette_LongGrass
@ sand
.4byte gBattleTerrainTiles_Sand
.4byte gBattleTerrainTilemap_Sand
.4byte gBattleTerrainAnimTiles_Sand
.4byte gBattleTerrainAnimTilemap_Sand
.4byte gBattleTerrainPalette_Sand
@ underwater
.4byte gBattleTerrainTiles_Underwater
.4byte gBattleTerrainTilemap_Underwater
.4byte gBattleTerrainAnimTiles_Underwater
.4byte gBattleTerrainAnimTilemap_Underwater
.4byte gBattleTerrainPalette_Underwater
@ water
.4byte gBattleTerrainTiles_Water
.4byte gBattleTerrainTilemap_Water
.4byte gBattleTerrainAnimTiles_Water
.4byte gBattleTerrainAnimTilemap_Water
.4byte gBattleTerrainPalette_Water
@ pond_water
.4byte gBattleTerrainTiles_PondWater
.4byte gBattleTerrainTilemap_PondWater
.4byte gBattleTerrainAnimTiles_PondWater
.4byte gBattleTerrainAnimTilemap_PondWater
.4byte gBattleTerrainPalette_PondWater
@ rock
.4byte gBattleTerrainTiles_Rock
.4byte gBattleTerrainTilemap_Rock
.4byte gBattleTerrainAnimTiles_Rock
.4byte gBattleTerrainAnimTilemap_Rock
.4byte gBattleTerrainPalette_Rock
@ cave
.4byte gBattleTerrainTiles_Cave
.4byte gBattleTerrainTilemap_Cave
.4byte gBattleTerrainAnimTiles_Cave
.4byte gBattleTerrainAnimTilemap_Cave
.4byte gBattleTerrainPalette_Cave
@ building
.4byte gBattleTerrainTiles_Building
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Building
@ plain
.4byte gBattleTerrainTiles_Building
.4byte gBattleTerrainTilemap_Building
.4byte gBattleTerrainAnimTiles_Building
.4byte gBattleTerrainAnimTilemap_Building
.4byte gBattleTerrainPalette_Plain
.align 2
gUnknown_0831AC70:: @ 831AC70
.4byte REG_BG3HOFS
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
.4byte 1
.4byte REG_BG3HOFS
.4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_32BIT | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
.4byte 1
.align 2
gUnknown_0831AC88:: @ 831AC88
spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8038528
gText_ShedinjaJapaneseName:: @ 831ACA0
.string "ヌケニン$" @ Nukenin
.align 2
gUnknown_0831ACA8:: @ 831ACA8
.2byte 0x0100
.2byte 0xC000
.2byte 0x0800
.align 2
gUnknown_0831ACB0:: @ 831ACB0
.2byte 0x0100
.2byte 0xC000
.2byte 0x2800
.align 2
gUnknown_0831ACB8:: @ 831ACB8
.2byte 0x0000, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_0831ACC0:: @ 831ACC0
.4byte gUnknown_0831ACB8
.align 2
gUnknown_0831ACC4:: @ 831ACC4
.2byte 0xfff0, 0x0000, 0x0400, 0x0000, 0x0000, 0x0000, 0x3c00, 0x0000, 0x7ffe, 0x0001, 0x0000, 0x0000
.align 2
gUnknown_0831ACDC:: @ 831ACDC
.4byte gUnknown_0831ACC4

4
data/map_events.s
View File

@@ -1,8 +1,12 @@
#include "constants/bg_event_constants.h"
#include "constants/event_object_movement_constants.h"
#include "constants/event_objects.h"
#include "constants/flags.h"
#include "constants/items.h"
#include "constants/maps.h"
#include "constants/secret_bases.h"
#include "constants/vars.h"
#include "constants/weather.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

4
data/maps.s
View File

@@ -1,5 +1,9 @@
#include "constants/map_types.h"
#include "constants/maps.h"
#include "constants/weather.h"
#include "constants/region_map_sections.h"
#include "constants/songs.h"
#include "constants/weather.h"
.include "asm/macros.inc"
.include "constants/constants.inc"

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

@@ -1,6 +1,6 @@
AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, 1, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100
AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C
warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK

8
data/maps/AbandonedShip_CaptainsOffice/header.inc
View File

@@ -5,11 +5,11 @@ AbandonedShip_CaptainsOffice: @ 84845A4
.4byte 0x0
.2byte MUS_DAN02
.2byte 195
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,6 +1,6 @@
AbandonedShip_Corridors_1F_EventObjects: @ 85366C0
object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0
object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, 45, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0
object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0
object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0
AbandonedShip_Corridors_1F_MapWarps: @ 85366F0
warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK

8
data/maps/AbandonedShip_Corridors_1F/header.inc
View File

@@ -5,11 +5,11 @@ AbandonedShip_Corridors_1F: @ 84844C4
.4byte 0x0
.2byte MUS_DAN02
.2byte 187
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

6
data/maps/AbandonedShip_Corridors_B1F/events.inc
View File

@@ -1,6 +1,6 @@
AbandonedShip_Corridors_B1F_EventObjects: @ 8536808
object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0
object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0
object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0
object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0
AbandonedShip_Corridors_B1F_MapWarps: @ 8536838
warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F
@@ -13,7 +13,7 @@ AbandonedShip_Corridors_B1F_MapWarps: @ 8536838
warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F
AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878
bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DC8
bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_237DC8
AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884
map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents

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

@@ -5,11 +5,11 @@ AbandonedShip_Corridors_B1F: @ 84844FC
.4byte 0x0
.2byte MUS_DAN02
.2byte 189
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

8
data/maps/AbandonedShip_Deck/header.inc
View File

@@ -5,11 +5,11 @@ AbandonedShip_Deck: @ 84844A8
.4byte 0x0
.2byte MUS_DAN02
.2byte 186
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -7,10 +7,10 @@ AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC
warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS
AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC
bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A19
bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A50
bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238A87
bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE
bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A19
bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A50
bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A87
bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE
AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C
map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents

8
data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
View File

@@ -5,11 +5,11 @@ AbandonedShip_HiddenFloorCorridors: @ 84845DC
.4byte 0x0
.2byte MUS_DAN02
.2byte 289
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

28
data/maps/AbandonedShip_HiddenFloorRooms/events.inc
View File

@@ -1,8 +1,8 @@
AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102
object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102
object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101
AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
@@ -16,16 +16,16 @@ AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0
warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8
bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0
bg_event 20, 5, 3, 7, 0, ITEM_ROOM_2_KEY, 32, 0
bg_event 1, 12, 3, 7, 0, ITEM_ROOM_4_KEY, 33, 0
bg_event 1, 2, 0, 7, 0, ITEM_ROOM_6_KEY, 34, 0
bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, 31
bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, 32
bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, 33
bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, 34
bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 16, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3
AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60
map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents

8
data/maps/AbandonedShip_HiddenFloorRooms/header.inc
View File

@@ -5,11 +5,11 @@ AbandonedShip_HiddenFloorRooms: @ 84845F8
.4byte 0x0
.2byte MUS_DAN02
.2byte 310
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 7
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,5 +1,5 @@
AbandonedShip_Room_B1F_EventObjects: @ 853697C
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098
AbandonedShip_Room_B1F_MapWarps: @ 8536994
warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F

8
data/maps/AbandonedShip_Room_B1F/header.inc
View File

@@ -5,11 +5,11 @@ AbandonedShip_Room_B1F: @ 848456C
.4byte 0x0
.2byte MUS_DAN02
.2byte 193
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

10
data/maps/AbandonedShip_Rooms2_1F/events.inc
View File

@@ -1,9 +1,9 @@
AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8
object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099
object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, 10, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0
object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, 9, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0
object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099
object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0
object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0
AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30
warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F

8
data/maps/AbandonedShip_Rooms2_1F/header.inc
View File

@@ -5,11 +5,11 @@ AbandonedShip_Rooms2_1F: @ 8484588
.4byte 0x0
.2byte MUS_DAN02
.2byte 194
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,6 +1,6 @@
AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4
object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097
object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097
AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924
warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F

8
data/maps/AbandonedShip_Rooms2_B1F/header.inc
View File

@@ -5,11 +5,11 @@ AbandonedShip_Rooms2_B1F: @ 8484534
.4byte 0x0
.2byte MUS_DAN02
.2byte 191
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,8 +1,8 @@
AbandonedShip_Rooms_1F_EventObjects: @ 8536764
object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095
object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, 8, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0
object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, 16, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0
object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095
object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0
object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0
AbandonedShip_Rooms_1F_MapWarps: @ 85367C4
warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F

8
data/maps/AbandonedShip_Rooms_1F/header.inc
View File

@@ -5,11 +5,11 @@ AbandonedShip_Rooms_1F: @ 84844E0
.4byte 0x0
.2byte MUS_DAN02
.2byte 188
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,6 +1,6 @@
AbandonedShip_Rooms_B1F_EventObjects: @ 8536898
object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096
object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0
object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096
AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8
warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F

8
data/maps/AbandonedShip_Rooms_B1F/header.inc
View File

@@ -5,11 +5,11 @@ AbandonedShip_Rooms_B1F: @ 8484518
.4byte 0x0
.2byte MUS_DAN02
.2byte 190
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 11
.byte 4
.byte WEATHER_SHADE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

8
data/maps/AbandonedShip_Underwater1/header.inc
View File

@@ -5,11 +5,11 @@ AbandonedShip_Underwater1: @ 8484550
.4byte 0x0
.2byte MUS_DEEPDEEP
.2byte 192
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 14
.byte 5
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
.byte 13
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

8
data/maps/AbandonedShip_Underwater2/header.inc
View File

@@ -5,11 +5,11 @@ AbandonedShip_Underwater2: @ 84845C0
.4byte 0x0
.2byte MUS_DEEPDEEP
.2byte 196
.byte 61
.byte MAPSEC_ABANDONED_SHIP
.byte 0
.byte 14
.byte 5
.byte WEATHER_BUBBLES
.byte MAP_TYPE_UNDERWATER
.2byte 0
.byte 13
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

8
data/maps/AlteringCave/header.inc
View File

@@ -5,11 +5,11 @@ AlteringCave: @ 8484A58
.4byte 0x0
.2byte MUS_RG_NANADUNGEON
.2byte 420
.byte 210
.byte MAPSEC_ALTERING_CAVE_2
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,5 +1,5 @@
AncientTomb_EventObjects: @ 8536CDC
object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937
object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937
AncientTomb_MapWarps: @ 8536CF4
warp_def 8, 29, 3, 0, MAP_ROUTE120
@@ -7,9 +7,9 @@ AncientTomb_MapWarps: @ 8536CF4
warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB
AncientTomb_MapBGEvents: @ 8536D0C
bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_239033
bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_239050
bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050
bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239033
bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050
bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050
AncientTomb_MapEvents:: @ 8536D30
map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents

8
data/maps/AncientTomb/header.inc
View File

@@ -5,11 +5,11 @@ AncientTomb: @ 8484630
.4byte 0x0
.2byte MUS_MABOROSI
.2byte 281
.byte 83
.byte MAPSEC_ANCIENT_TOMB
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

6
data/maps/AquaHideout_1F/events.inc
View File

@@ -1,7 +1,7 @@
AquaHideout_1F_EventObjects: @ 8535304
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822
object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, 50, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822
object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, 924
AquaHideout_1F_MapWarps: @ 853534C
warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY

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

@@ -5,11 +5,11 @@ AquaHideout_1F: @ 8484144
.4byte 0x0
.2byte MUS_AJITO
.2byte 143
.byte 197
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 8
.byte 3
.byte MAP_BATTLE_SCENE_AQUA

18
data/maps/AquaHideout_B1F/events.inc
View File

@@ -1,13 +1,13 @@
AquaHideout_B1F_EventObjects: @ 8535378
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071
object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924
object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124
object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977
object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132
object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978
object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, 7, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071
object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 20, 18, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924
object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291358, 1124
object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977
object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_291365, 1132
object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, 978
object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924
AquaHideout_B1F_MapWarps: @ 8535450
warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F

8
data/maps/AquaHideout_B1F/header.inc
View File

@@ -5,11 +5,11 @@ AquaHideout_B1F: @ 8484160
.4byte 0x0
.2byte MUS_AJITO
.2byte 144
.byte 197
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 8
.byte 3
.byte MAP_BATTLE_SCENE_AQUA

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

@@ -1,10 +1,10 @@
AquaHideout_B2F_EventObjects: @ 853552C
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, 45, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072
object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943
object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, 10, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924
object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, 9, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924
object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924
object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924
object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072
object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 943
object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924
object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924
AquaHideout_B2F_MapWarps: @ 85355BC
warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F
@@ -19,8 +19,8 @@ AquaHideout_B2F_MapWarps: @ 85355BC
warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F
AquaHideout_B2F_MapCoordEvents: @ 853560C
coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5
coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5
coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5
coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5
AquaHideout_B2F_MapEvents:: @ 853562C
map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0

8
data/maps/AquaHideout_B2F/header.inc
View File

@@ -5,11 +5,11 @@ AquaHideout_B2F: @ 848417C
.4byte 0x0
.2byte MUS_AJITO
.2byte 145
.byte 197
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 8
.byte 3
.byte MAP_BATTLE_SCENE_AQUA

8
data/maps/AquaHideout_UnusedRubyMap1/header.inc
View File

@@ -5,11 +5,11 @@ AquaHideout_UnusedRubyMap1: @ 84846D8
.4byte 0x0
.2byte MUS_AJITO
.2byte 316
.byte 197
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 2
.byte MAP_BATTLE_SCENE_MAGMA

8
data/maps/AquaHideout_UnusedRubyMap2/header.inc
View File

@@ -5,11 +5,11 @@ AquaHideout_UnusedRubyMap2: @ 84846F4
.4byte 0x0
.2byte MUS_AJITO
.2byte 317
.byte 197
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 2
.byte MAP_BATTLE_SCENE_MAGMA

8
data/maps/AquaHideout_UnusedRubyMap3/header.inc
View File

@@ -5,11 +5,11 @@ AquaHideout_UnusedRubyMap3: @ 8484710
.4byte 0x0
.2byte MUS_AJITO
.2byte 318
.byte 197
.byte MAPSEC_AQUA_HIDEOUT
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 2
.byte MAP_BATTLE_SCENE_MAGMA

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

@@ -1,5 +1,5 @@
ArtisanCave_1F_EventObjects: @ 8537774
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163
ArtisanCave_1F_MapWarps: @ 853778C
warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST

8
data/maps/ArtisanCave_1F/header.inc
View File

@@ -5,11 +5,11 @@ ArtisanCave_1F: @ 84849B0
.4byte 0x0
.2byte MUS_DAN01
.2byte 401
.byte 202
.byte MAPSEC_ARTISAN_CAVE
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

10
data/maps/ArtisanCave_B1F/events.inc
View File

@@ -1,15 +1,15 @@
ArtisanCave_B1F_EventObjects: @ 8537708
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, 1, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162
object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162
ArtisanCave_B1F_MapWarps: @ 8537720
warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F
ArtisanCave_B1F_MapBGEvents: @ 8537730
bg_event 32, 29, 0, 7, 0, ITEM_ZINC, 102, 0
bg_event 27, 8, 0, 7, 0, ITEM_CALCIUM, 101, 0
bg_event 7, 5, 0, 7, 0, ITEM_PROTEIN, 103, 0
bg_event 19, 43, 0, 7, 0, ITEM_IRON, 104, 0
bg_hidden_item_event 32, 29, 0, ITEM_ZINC, 102
bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, 101
bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, 103
bg_hidden_item_event 19, 43, 0, ITEM_IRON, 104
ArtisanCave_B1F_MapEvents:: @ 8537760
map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents

8
data/maps/ArtisanCave_B1F/header.inc
View File

@@ -5,11 +5,11 @@ ArtisanCave_B1F: @ 8484994
.4byte 0x0
.2byte MUS_DAN01
.2byte 400
.byte 202
.byte MAPSEC_ARTISAN_CAVE
.byte 0
.byte 0
.byte 4
.byte WEATHER_NONE
.byte MAP_TYPE_UNDERGROUND
.2byte 0
.byte 15
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,13 +1,13 @@
BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, 7, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 9, 3, 7, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 5, 3, 10, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 5, 3, 9, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 15, 6, 3, 9, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 3, 10, 1, 1, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 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 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 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4
map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0

8
data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattleArenaBattleRoom: @ 8485484
.4byte 0x0
.2byte MUS_B_ARENA
.2byte 356
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,5 +1,5 @@
BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8
map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0

8
data/maps/BattleFrontier_BattleArenaCorridor/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattleArenaCorridor: @ 8485468
.4byte 0x0
.2byte MUS_B_ARENA
.2byte 355
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

14
data/maps/BattleFrontier_BattleArenaLobby/events.inc
View File

@@ -1,16 +1,16 @@
BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 10, 3, 2, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0
object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 14, 11, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0
object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0
object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, 9, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0
object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0
object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0
object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0
object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0
BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C
warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894
bg_event 5, 9, 3, 1, 0, BattleFrontier_BattleArenaLobby_EventScript_256092
bg_event 1, 7, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560CA
bg_event 5, 9, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleArenaLobby_EventScript_256092
bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleArenaLobby_EventScript_2560CA
BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC
map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents

8
data/maps/BattleFrontier_BattleArenaLobby/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattleArenaLobby: @ 848544C
.4byte 0x0
.2byte MUS_B_ARENA
.2byte 354
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,19 +1,19 @@
BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4
object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 7, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 16, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 16, 1, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 1, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 13, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 10, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 13, EVENT_OBJ_GFX_TRADER, 0, 4, 9, 4, 7, 1, 1, 0, 0, 0x0, 0
object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 14, 2, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 11, 6, 0, 9, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 11, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 16, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 16, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 8, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 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 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 14, EVENT_OBJ_GFX_WOMAN_4, 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
BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C
map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0

8
data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattleDomeBattleRoom: @ 8485388
.4byte 0x0
.2byte MUS_B_DOME
.2byte 335
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,5 +1,5 @@
BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164
warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST

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

@@ -5,11 +5,11 @@ BattleFrontier_BattleDomeCorridor: @ 8485350
.4byte 0x0
.2byte MUS_B_DOME1
.2byte 333
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

20
data/maps/BattleFrontier_BattleDomeLobby/events.inc
View File

@@ -1,20 +1,20 @@
BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0
object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 1, 11, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0
object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0
object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0
object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0
object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0
object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0
object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0
object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 18, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0
object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0
object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0
BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8
warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108
bg_event 4, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D52
bg_event 7, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D84
bg_event 18, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249D6B
bg_event 15, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E34
bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D52
bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D84
bg_event 18, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D6B
bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249E34
BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138
map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents

8
data/maps/BattleFrontier_BattleDomeLobby/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattleDomeLobby: @ 8485334
.4byte 0x0
.2byte MUS_B_DOME1
.2byte 332
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,5 +1,5 @@
BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0
warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST

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

@@ -5,11 +5,11 @@ BattleFrontier_BattleDomePreBattleRoom: @ 848536C
.4byte 0x0
.2byte MUS_B_DOME
.2byte 334
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,12 +1,12 @@
BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 7, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 4, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 6, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 8, 255, 0, 5, 11, 0, 7, 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 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
BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C
map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0

8
data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattleFactoryBattleRoom: @ 84854D8
.4byte 0x0
.2byte MUS_B_FACTORY
.2byte 348
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

18
data/maps/BattleFrontier_BattleFactoryLobby/events.inc
View File

@@ -1,19 +1,19 @@
BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, 2, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0
object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0
object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, 10, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0
object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, 1, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0
object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, 8, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0
object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0
object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0
object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0
object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0
BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68
warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78
bg_event 2, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587E1
bg_event 11, 7, 0, 1, 0, BattleFrontier_BattleFactoryLobby_EventScript_2587FA
bg_event 9, 4, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258839
bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1
bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA
bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleFactoryLobby_EventScript_258839
BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C
map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents

8
data/maps/BattleFrontier_BattleFactoryLobby/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattleFactoryLobby: @ 84854A0
.4byte 0x0
.2byte MUS_B_FACTORY
.2byte 346
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,5 +1,5 @@
BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, 7, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8
map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0

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

@@ -5,11 +5,11 @@ BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC
.4byte 0x0
.2byte MUS_B_FACTORY
.2byte 347
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,9 +1,9 @@
BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC
object_event 1, EVENT_OBJ_GFX_TRADER, 0, 1, 9, 3, 7, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 1, 4, 3, 10, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, 8, 1, 1, 0, 0, 0x0, 0
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 3, EVENT_OBJ_GFX_OLD_MAN_1, 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
BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574
warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR

8
data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattlePalaceBattleRoom: @ 84853DC
.4byte 0x0
.2byte MUS_B_PALACE
.2byte 344
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

14
data/maps/BattleFrontier_BattlePalaceCorridor/events.inc
View File

@@ -1,11 +1,11 @@
BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420
object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 12, 3, 7, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, 14, 0, 2, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, 1, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, 14, 0, 2, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, 1, 0, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, 2, 1, 2, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 8, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 15, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 9, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, 0x0, 0
BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8
warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY

8
data/maps/BattleFrontier_BattlePalaceCorridor/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattlePalaceCorridor: @ 84853C0
.4byte 0x0
.2byte MUS_B_PALACE
.2byte 343
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

18
data/maps/BattleFrontier_BattlePalaceLobby/events.inc
View File

@@ -1,10 +1,10 @@
BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340
object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 6, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0
object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0
object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0
object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 18, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0
object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0
object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 19, 6, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0
object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0
object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0
object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0
object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 18, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0
object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0
object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0
BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0
warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
@@ -12,9 +12,9 @@ BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0
warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR
BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8
bg_event 2, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC50
bg_event 16, 7, 0, 1, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC69
bg_event 10, 4, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6
bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC50
bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC69
bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6
BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C
map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents

8
data/maps/BattleFrontier_BattlePalaceLobby/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattlePalaceLobby: @ 84853A4
.4byte 0x0
.2byte MUS_B_PALACE
.2byte 342
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,5 +1,5 @@
BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 6, 6, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C
map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0

8
data/maps/BattleFrontier_BattlePikeCorridor/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattlePikeCorridor: @ 8485510
.4byte 0x0
.2byte MUS_B_TUBE
.2byte 350
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

12
data/maps/BattleFrontier_BattlePikeLobby/events.inc
View File

@@ -1,8 +1,8 @@
BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 5, 5, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0
object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, 7, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0
object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 3, 9, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0
object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, 2, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0
object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0
object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0
object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0
BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10
warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
@@ -10,8 +10,8 @@ BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10
warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28
bg_event 8, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BA80
bg_event 1, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAC6
bg_event 8, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BA80
bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BAC6
BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40
map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents

8
data/maps/BattleFrontier_BattlePikeLobby/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattlePikeLobby: @ 84854F4
.4byte 0x0
.2byte MUS_B_TUBE
.2byte 349
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,15 +1,15 @@
BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 4, 4, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0
object_event 2, EVENT_OBJ_GFX_TRADER, 0, 3, 4, 3, 8, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0
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
BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84
coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
coord_event 3, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
coord_event 3, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
coord_event 4, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
coord_event 5, 6, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
coord_event 4, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
coord_event 5, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2
coord_event 3, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
coord_event 3, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
coord_event 4, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
coord_event 5, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082
coord_event 4, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
coord_event 5, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D
BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4
map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0

8
data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattlePikeRandomRoom1: @ 8485548
.4byte 0x0
.2byte MUS_B_TUBE
.2byte 352
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,5 +1,5 @@
BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, 8, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20
map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0

8
data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattlePikeRandomRoom2: @ 8485564
.4byte 0x0
.2byte MUS_B_TUBE
.2byte 353
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

14
data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc
View File

@@ -1,11 +1,11 @@
BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34
coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174
coord_event 3, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
coord_event 4, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
coord_event 5, 18, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
coord_event 3, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
coord_event 4, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
coord_event 5, 19, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174
coord_event 3, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
coord_event 4, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
coord_event 5, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202
coord_event 3, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
coord_event 4, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
coord_event 5, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D
BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4
map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0

8
data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattlePikeRandomRoom3: @ 8485580
.4byte 0x0
.2byte MUS_B_TUBE
.2byte 358
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,17 +1,17 @@
BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0
object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0
object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0
BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0
coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E
coord_event 6, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59
coord_event 10, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64
coord_event 5, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
coord_event 6, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
coord_event 6, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
coord_event 5, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
coord_event 7, 9, 3, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
coord_event 7, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E
coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59
coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64
coord_event 5, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
coord_event 6, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
coord_event 6, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
coord_event 5, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062
coord_event 7, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D
BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40
map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0

8
data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattlePikeThreePathRoom: @ 848552C
.4byte 0x0
.2byte MUS_B_TUBE
.2byte 351
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

18
data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc
View File

@@ -1,13 +1,13 @@
BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0
object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 0, 10, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0
object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 0, 8, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0
object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0
object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 9, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0
object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0
object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0
object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0
object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, 2, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0
object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0
object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0
object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 14, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0
object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 1, 9, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0
object_event 6, EVENT_OBJ_GFX_TEALA, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0
object_event 7, EVENT_OBJ_GFX_TEALA, 0, 9, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0
object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0
object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0
BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0
warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST

8
data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4
.4byte 0x0
.2byte MUS_B_TOWER
.2byte 398
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

32
data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc
View File

@@ -1,20 +1,20 @@
BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C
object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, 1, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, 1, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, 1, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, 1, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, 1, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, 1, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, 1, 1, 1, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, 1, 1, 1, 0, 0, 0x0, 0
object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, 1, 1, 1, 0, 0, 0x0, 0
object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, 1, 1, 1, 0, 0, 0x0, 0
object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, 1, 1, 1, 0, 0, 0x0, 0
object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, 1, 1, 1, 0, 0, 0x0, 0
object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, 1, 1, 1, 0, 0, 0x0, 0
object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, 1, 1, 1, 0, 0, 0x0, 0
object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, 1, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 3, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 4, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC
map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0

8
data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattlePyramidEmptySquare: @ 8485414
.4byte 0x0
.2byte 65535
.2byte 361
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

12
data/maps/BattleFrontier_BattlePyramidLobby/events.inc
View File

@@ -1,15 +1,15 @@
BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598
object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, 8, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0
object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, 9, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0
object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, 2, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0
object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, 2, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0
object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0
object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0
object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0
object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0
BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8
warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST
BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600
bg_event 5, 12, 0, 1, 0, BattleFrontier_BattlePyramidLobby_EventScript_250D42
bg_event 1, 12, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E95
bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42
bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95
BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618
map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents

8
data/maps/BattleFrontier_BattlePyramidLobby/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattlePyramidLobby: @ 84853F8
.4byte 0x0
.2byte MUS_PYRAMID
.2byte 360
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

6
data/maps/BattleFrontier_BattlePyramidTop/events.inc
View File

@@ -1,9 +1,9 @@
BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0
object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, 8, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0
object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, 7, 1, 1, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0
object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0
BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0
coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256
coord_event 17, 9, 4, VAR_TEMP_2, 0, BattleFrontier_BattlePyramidTop_EventScript_255256
BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800
map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0

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

@@ -5,11 +5,11 @@ BattleFrontier_BattlePyramidTop: @ 8485430
.4byte 0x0
.2byte 65535
.2byte 378
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 4
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,7 +1,7 @@
BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888
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
BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818
warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY

8
data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattleTowerBattleRoom: @ 848521C
.4byte 0x0
.2byte MUS_SATTOWER
.2byte 268
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 8
.byte MAP_BATTLE_SCENE_FRONTIER

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

@@ -1,10 +1,10 @@
BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0
object_event 4, EVENT_OBJ_GFX_TRADER, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888
object_event 5, 255, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0
object_event 6, 254, 0, 5, 8, 3, 7, 0, 0, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 888
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, 888
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
BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054
map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0

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

@@ -5,11 +5,11 @@ BattleFrontier_BattleTowerBattleRoom2: @ 8485318
.4byte 0x0
.2byte MUS_SATTOWER
.2byte 268
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 8
.byte MAP_BATTLE_SCENE_FRONTIER

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

@@ -1,5 +1,5 @@
BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0
object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0
BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC
map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0

8
data/maps/BattleFrontier_BattleTowerCorridor/header.inc
View File

@@ -5,11 +5,11 @@ BattleFrontier_BattleTowerCorridor: @ 8485200
.4byte 0x0
.2byte MUS_SATTOWER
.2byte 267
.byte 58
.byte MAPSEC_BATTLE_FRONTIER
.byte 0
.byte 0
.byte 8
.byte WEATHER_NONE
.byte MAP_TYPE_INDOOR
.2byte 0
.byte 0
.byte 0
.byte MAP_BATTLE_SCENE_NORMAL

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

@@ -1,8 +1,8 @@
BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50
object_event 1, 255, 0, 1, 1, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, 7, 1, 1, 0, 0, 0x0, 0
object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, 7, 1, 1, 0, 0, 0x0, 0
object_event 4, 254, 0, 14, 1, 0, 8, 1, 1, 0, 0, 0x0, 0
object_event 1, 255, 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
BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0
map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0

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