Epsilon_02/pokeemerald-modern
1
0
Fork 0
mirror of https://github.com/resetes12/pokeemerald synced 2025-10-05 16:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Followers, lighting, fixes and more

Browse Source
This commit is contained in:
resetes12
2023-05-05 19:26:00 +02:00
parent 8b634f6d18 9da790b2da
commit c7b408b134
928 changed files with 15334 additions and 6583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
.github/workflows/build.yml vendored
View File

@@ -1,68 +1,25 @@
name: CI
name: Build ROM
on:
push:
branches: [ master ]
branches: [ followers ]
pull_request:
jobs:
build:
build_rom:
name: Build ROM
runs-on: ubuntu-latest
env:
GAME_VERSION: EMERALD
GAME_REVISION: 0
GAME_LANGUAGE: ENGLISH
MODERN: 0
COMPARE: 1
steps:
- name: Checkout
uses: actions/checkout@master
- name: Checkout syms
if: ${{ github.event_name == 'push' }}
uses: actions/checkout@master
with:
path: symbols
ref: symbols
- name: Checkout agbcc
uses: actions/checkout@master
with:
path: agbcc
repository: pret/agbcc
- name: Install binutils
run: sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi
# build-essential, git, and libpng-dev are already installed
# gcc-arm-none-eabi is only needed for the modern build
# as an alternative to dkP
- name: Install agbcc
- uses: actions/checkout@v2
- name: Install dependencies
run: sudo apt-get install binutils-arm-none-eabi gcc-arm-none-eabi
- name: Build & install agbcc
run: |
cd ..
git clone --depth 1 https://github.com/pret/agbcc
cd agbcc
./build.sh
./install.sh ../
working-directory: agbcc
- name: Compare
run: make -j${nproc} all syms
- name: Modern
env:
MODERN: 1
COMPARE: 0
run: make -j${nproc} all
- name: Move symfiles
if: ${{ github.event_name == 'push' }}
./install.sh ../pokeemerald
- name: Build ROM
run: |
cp -v *.sym symbols/
echo "SYMBOLS_COMMIT_MSG=$( git log --format=%s ${GITHUB_SHA} )" >> $GITHUB_ENV
- name: Update symfiles
if: ${{ github.event_name == 'push' }}
uses: EndBug/add-and-commit@v7
with:
branch: symbols
cwd: "./symbols"
add: "*.sym"
message: ${{ env.SYMBOLS_COMMIT_MSG }}
make

6
.gitignore vendored
View File

@@ -35,7 +35,13 @@ prefabs.json
.vscode/
*.a
.fuse_hidden*
.ccls-cache/*
.ropeproject/
/overworld/
/icons/
*.sna
*.diff
*.sym
*.js
agbcc/
/*.zip

7
Makefile
View File

@@ -305,6 +305,11 @@ ifeq ($(DINFO),1)
override CFLAGS += -g
endif
ifeq ($(DDEBUG),1)
override ASFLAGS += --defsym DEBUG=1
override CPPFLAGS += -D DEBUG=1
endif
# The dep rules have to be explicit or else missing files won't be reported.
# As a side effect, they're evaluated immediately instead of when the rule is invoked.
# It doesn't look like $(shell) can be deferred so there might not be a better way.
@@ -424,7 +429,7 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) libagbsyscall
$(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@
$(FIX) $@ -p --silent
$(FIX) $@ --silent
modern: all

31
README.md
View File

@@ -4,8 +4,35 @@ This is a decompilation of Pokémon Emerald, edited to be Pokémon Modern Emeral
You can get more information about Modern Emerald at [Pokecommunity](https://www.pokecommunity.com/showthread.php?t=494005)
It builds the following ROM:
This fork tries to maintain vanilla compatibility whenever possible. It doesn't increase the size of any save data structure or the object event structure.
* [**pokeemerald.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1961) `sha1: f3ae088181bf583e55daf962a92bb46f4f1d07b7`
There are several branches, each with one main feature (and sometimes some extra stuff):
**followers** branch:
* [HGSS-style pokémon followers](https://bulbapedia.bulbagarden.net/wiki/Walking_Pok%C3%A9mon#Pok.C3.A9mon_HeartGold_and_SoulSilver) for all 386 pokémon, including emotes, the 28 Unown forms and a majority of follower messages.
* Dynamic overworld palettes & reflections compatible with vanilla berry trees.
* PID (but not legitimacy) preserving Pokémon nature-changing function
* Function to detect modern emulators/GBA hardware.
**icons** branch:
* Everything from the **followers** branch.
* All pokemon icons updated to Gen 6, based on [this repo](https://github.com/msikma/pokesprite/tree/master/icons/pokemon/regular)
* This includes compatibility with the PC, trade, contests, mail, Battle Dome. Examples:
![PC](https://i.imgur.com/wzwJfd1.png)
![Party](https://i.imgur.com/8hbE88t.png)
![Contest](https://i.imgur.com/S9mCEFL.png)
* Icons share palettes with front sprites, meaning that shiny pokemon will also have shiny icons!
**lighting** branch:
* Everything from the **followers** branch.
* Day/night shading compatible with weather.
* GSC-style window lights.
* WIP interframe-blended lamp lights at night, i.e in Rustboro.
* HGSS-style alpha-blended shadows for object events.
Additional branches to mention:
* `followers-expanded-id` - like `followers`, but includes backwards-compatible 16-bit graphics IDs for object events.
* `lighting-expanded-id` - like the above but for `lighting`.
To set up the repository, see [INSTALL.md](INSTALL.md).

10
asm/macros/event.inc
View File

@@ -1676,9 +1676,11 @@
@ Equivalent to fadescreen but copies gPlttBufferUnfaded to gPaletteDecompressionBuffer on the fade out
@ and the reverse on the fade in, in effect saving gPlttBufferUnfaded to restore it.
.macro fadescreenswapbuffers mode:req
@ If nowait set, does not wait for the fade to complete
.macro fadescreenswapbuffers mode:req, nowait=0
.byte 0xdc
.byte \mode
.byte \nowait
.endm
@ Buffers the specified trainer's class name to the given string var.
@@ -1752,6 +1754,12 @@
.macro deleteparty
.byte 0xe6
.endm
@ Like callnative, but function expects a ctx
.macro callfunc func:req
.byte 0xe7
.4byte \func
.endm
@ Supplementary

5
asm/macros/map.inc
View File

@@ -21,10 +21,9 @@
@ Defines an object event template for map data. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h
.macro object_event index:req, gfx:req, inConnection:req, x:req, y:req, elevation:req, movement_type:req, x_radius:req, y_radius:req, trainer_type:req, sight_radius_tree_etc:req, script:req, event_flag:req
.byte \index
.byte \gfx
.byte \index
.2byte \gfx
.byte \inConnection
.space 1 @ Padding
.2byte \x, \y
.byte \elevation
.byte \movement_type

2
asm/macros/movement.inc
View File

@@ -162,5 +162,7 @@
create_movement_action figure_8, MOVEMENT_ACTION_FIGURE_8
create_movement_action fly_up, MOVEMENT_ACTION_FLY_UP
create_movement_action fly_down, MOVEMENT_ACTION_FLY_DOWN
create_movement_action exit_pokeball, MOVEMENT_ACTION_EXIT_POKEBALL
create_movement_action enter_pokeball, MOVEMENT_ACTION_ENTER_POKEBALL
create_movement_action step_end, MOVEMENT_ACTION_STEP_END

3
common_syms/overworld.txt
View File

@@ -6,3 +6,6 @@ gFieldCallback
gFieldCallback2
gLocalLinkPlayerId
gFieldLinkPlayerCount
gTimeOfDay
currentTimeBlend
gTimeUpdateCounter

7
compile_flags.txt Executable file
View File

@@ -0,0 +1,7 @@
-Wimplicit -Wparentheses -Werror -O2
-lgcc
-lc
-Iinclude
-Igflib
-undef
-Itools/agbcc/include

8
data/event_scripts.s
View File

@@ -717,11 +717,14 @@ Common_EventScript_PlayGymBadgeFanfare::
return
Common_EventScript_OutOfCenterPartyHeal::
fadescreen FADE_TO_BLACK
fadescreenswapbuffers FADE_TO_BLACK
playfanfare MUS_HEAL
waitfanfare
special HealPlayerParty
fadescreen FADE_FROM_BLACK
@ start fade then immediately load following pokemon, and wait for fade
fadescreenswapbuffers FADE_FROM_BLACK, 1
callnative UpdateFollowingPokemon
callfunc ScrFunc_WaitPaletteNotActive
return
EventScript_RegionMap::
@@ -1054,6 +1057,7 @@ Common_EventScript_LegendaryFlewAway::
.include "data/scripts/move_tutors.inc"
.include "data/scripts/trainer_hill.inc"
.include "data/scripts/test_signpost.inc"
.include "data/scripts/follower.inc"
.include "data/text/frontier_brain.inc"
.include "data/text/save.inc"
.include "data/text/birch_speech.inc"

15
data/field_effect_scripts.s
View File

@@ -72,6 +72,9 @@ gFieldEffectScriptPointers::
.4byte gFieldEffectScript_RayquazaSpotlight @ FLDEFF_RAYQUAZA_SPOTLIGHT
.4byte gFieldEffectScript_DestroyDeoxysRock @ FLDEFF_DESTROY_DEOXYS_ROCK
.4byte gFieldEffectScript_MoveDeoxysRock @ FLDEFF_MOVE_DEOXYS_ROCK
.4byte gFieldEffectScript_TracksSlither @ FLDEFF_TRACKS_SLITHER
.4byte gFieldEffectScript_TracksBug @ FLDEFF_TRACKS_BUG
.4byte gFieldEffectScript_TracksSpot @ FLDEFF_TRACKS_SPOT
gFieldEffectScript_ExclamationMarkIcon1::
field_eff_callnative FldEff_ExclamationMarkIcon
@@ -129,6 +132,14 @@ gFieldEffectScript_SandFootprints::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints
field_eff_end
gFieldEffectScript_TracksBug::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksBug
field_eff_end
gFieldEffectScript_TracksSpot::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksSpot
field_eff_end
gFieldEffectScript_JumpBigSplash::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash
field_eff_end
@@ -218,6 +229,10 @@ gFieldEffectScript_BikeTireTracks::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_BikeTireTracks
field_eff_end
gFieldEffectScript_TracksSlither::
field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_TracksSlither
field_eff_end
gFieldEffectScript_SandDisguisePlaceholder::
field_eff_callnative ShowSandDisguiseFieldEffect
field_eff_end

4
data/layouts/BattleFrontier_BattleDomeBattleRoom/map.bin
View File

@@ -1,2 +1,2 @@
аабааааааабааааабааааабааааааабааааабаааввгвввввввгвввввгвввдежзийкдежзийкдежзий  стуфхцч      щъыьэюя      ёђѓєѕії !"#$%&      љњћќ§ўџ()*+,-.      0123456       
   89:;<=>>   
а2а2ба2а2а2а2а2а2а2ба2а2а2а2а2ба2а2а2аRаRбаRаRаRаRаRаRаRбаRаRаRаRаRбаRаRаRв2в2гв2в2в2в2в2в2в2гв2в2в2в2в2гв2в2в2дежзийкдежзийкдежзий 3 3с2т2у2ф2х2ц2ч23333333 3 3 3 3 3 3щ2ъыьэBюBяBCCC3 3 3 3 3 3 3ё2ђBѓBєBѕBіBїB C!C"C#C$C%C&3 3 3 3 3 3 3љ2њћќ§BўBџB(C)C*C+,-.3 3 3 3 3 3 3333301233435363 3 3 3 3 3 3 3
3 3 3 3338393:3;3<3=3>3>3 3 3 3

2
data/layouts/LavaridgeTown/map.bin
View File

@@ -1,3 +1,3 @@
qqqq{ttttt|qqqqqqq66{tttzq2®2®2®2®2xttttttttr{™š››œ2<C593>tž2|qqqNKLOq6rr¡£2¼2£2£2¥JHIMyy0123rr¡»233»2¥PQRS2289:;Æ4Æ4rr©ª2£2¼2¬2­XYZ[Ö5×5`ABCÆ4Æ4rr±²³³´µ`abcæ5ç50 1"1044rrº2¨2¨2¨2¹2Š20 1"10000 1"1000rr¨2˜2¨2˜2Œ2’20 1"1000 1"1000rr¨ B¨ BŠ00 1!11111!1!1111rr‘2‘‘2‘’200(1)1)1)1)1)1)1)1)1)1)1rrª1«1«1«1«1¬1000000000000rr²³³³³´0000 0 0
qqqq{ttttt|qqqqqqq66{tttzq2®2®2®2®2xttttttttr{™š››œ2<C593>tž2|qqqNKLOq6rr¡£2¼2£2£2¥JHIMyy0123rr¡»2£2£2»2¥PQRS2289:;Æ4Æ4rr©ª2£2¼2¬2­XYZ[Ö5×5`ABCÆ4Æ4rr±²³³´µ`abcæ5ç50 1"1044rrº2¨2¨2¨2¹2Š20 1"10000 1"1000rr¨2˜2¨2˜2Œ2’20 1"1000 1"1000rr¨ B¨ BŠ00 1!11111!1!1111rr‘2‘‘2‘’200(1)1)1)1)1)1)1)1)1)1)1rrª1«1«1«1«1¬1000000000000rr²³³³³´0000 0 0
00 0 0
00rrё№єі»ј0000rrАБВЕГџ000  Ж4rrИ1Й1КНЛ§000 !" !"Ж4rr00000000000040000Ж4m000000000000000Ж4Ж4qqrm0000000000000044qqllllllllllllllll

2
data/layouts/LittlerootTown/map.bin
View File

@@ -1,3 +1,3 @@
ÔÕÔÕÔÕÔÕÔÕ500ÔÕÔÕÔÕÔÕÜÝäåäåäåäç00æåäåäåÜÝÔÕ0000000000000000ÔÕäç0000000000000000æå002 2 2 2
20000002 2 2 2
2000000000000000000000000"20@!000000 @12#0000*:8H)400004(H9:+000000020000000020000000π00000000π0000000000000000000000000000000 2B2C2 2 2 220000000000000JK0000000000000000000000000,A-00000000Ξ1Ο1000&4I5'00000000ΦΥΞ1Ο10000200000000Ξ1Ο1άέΤΧ00000000000000ΦΥΤΥάέΞ1Ο1Ξ1Ο1Ξ1Ο1Ξ1Ο1Ξ1Ο1Ξ1Ο1Ξ1Ο1άέάέ
2000000000000000000000000"20@!000000 @12#0000*:8H)400004(H9:+000000020000000020000000π00000000π0000000000000000000000000000000 2B2C2 2 2 220000000000000JK0000000000000000000000000//,A-00000000Ξ1Ο1000&774I5'00000000ΦΥΞ1Ο10000200000000Ξ1Ο1άέΤΧ00000000000000ΦΥΤΥάέΞ1Ο1Ξ1Ο1Ξ1Ο1Ξ1Ο1Ξ1Ο1Ξ1Ο1Ξ1Ο1άέάέ

2
data/layouts/Mart/map.bin
View File

@@ -1,3 +1,3 @@
"#$#$D*()() 222 2220212!212%2
22:2222222-92:222+,22+ AB22234223
22:2222222-892:222+,22+@AB22234223
222222;<22;222222222

6
data/layouts/PetalburgCity/map.bin
View File

@@ -1,4 +1,4 @@
ÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÔÕÜÝÜÝUNMNMNVòóòóòóòóåäåäåäåÜÝÜÝÔÕÔÕD   
Fдедедеде000АББВдедемнмнLLц5хфхфхфч5АББРЁЁКмнмндедеT  L?ЊЋЋЋЋЌ?ИЁЁЁЁЁКдедемнмн0 !"LLВГГГГДLИЁЁЁЁЁКмнмндеде001100LLИЙКГЛМLИЁЁЁЁЁКдедемнмн00 1"100LLРСТХУФLИЁЁЁЁЁКмнмндеде00 1"10<2fLШ1Щ1ЪЭЫЬ1LИЁЁЁЁЁКдедемнф5ч500 1"1deT0011101T00000P2Q2XYмнде0000 1"1000000 1!1"110000000123дец5ч50000 1"1000000 1!1"1000000089:;мн001111!1!1111111!1!1"10000000`ABCдеЮ1Я1(1)1)1)1)1R2S2)1)1)1)1)1)1!1"100H0I0J0K000110мндзАБББВжз000000 1"100PQRS00 1"10демнИЁЁЁКмн000000 1"100XYZ[00 1"10ц5хдеИЁЁЁКде0 0 0
000 1"10`abc00 1"1000мнИЁЁЁКмн00 1!111111111!1!1100деИЁЁЁКде 00 1!1)1)1)1)1)1)1)1)1)1)1*100мнИЁЁЁКц5ч5 !"00 1"1000000000Ю1Я1Ю1Я1деИЁЁЁК00020000 1"10<2=2=2=2=2=2=2>2жедемнИЁЁЁК00000000 1"10D  
EEFмнмндеИЁЁЁК00000000 1"10LLдедемнИЁЁЁТББББВЮ1Я10 1"10T LмнмндеИЁЁЁЁЁЁЁЁКжз0 1"100 !"00LдедемнИЁЁЁЁЁЁЁЁКмн0 1!111111000LмнмндеИЁЁЁЁЁЁЁЁКде0(1)1)1)1)1)1*1000TдедемнИЁЁўџўџўџКмнЮ1Я1Ю1Я1Ю1Я1Ю1Я1Ю1Я1Ю1Я1мнмнде000ќ§ќ§ќ§0дедедедедедедедедемнЮ1Я1Ю1ѓђѓђѓђЯ1мнмнмнмнмнмнмнмнмн
Fдедедеде000АББВдедемнмнLLц5хфхфхфч5АББРЁЁКмнмндедеTwwL?ЊЋЋЋЋЌ?ИЁЁЁЁЁКдедемнмн0 _!_"LLВГГГГДLИЁЁЁЁЁКмнмндеде001100LLИЙКГЛМLИЁЁЁЁЁКдедемнмн00 1"100LLРСТХУФLИЁЁЁЁЁКмнмндеде00 1"10<2fLШ1Щ1ЪЭЫЬ1LИЁЁЁЁЁКдедемнф5ч500 1"1deT0011101T00000P2Q2XYмнде0000 1"1000000 1!1"110000000123дец5ч50000 1"1000000 1!1"1000000089:;мн001111!1!1111111!1!1"10000000`ABCдеЮ1Я1(1)1)1)1)1R2S2)1)1)1)1)1)1!1"100H0I0J0K000110мндзАБББВжз000000 1"100PQRS00 1"10демнИЁЁЁКмн000000 1"100XYZ[00 1"10ц5хдеИЁЁЁКде0 0 0
000 1"10`abc00 1"1000мнИЁЁЁКмн00 1!111111111!1!1100деИЁЁЁКдеw00 1!1)1)1)1)1)1)1)1)1)1)1*100мнИЁЁЁКц5ч5 !_"00 1"1000000000Ю1Я1Ю1Я1деИЁЁЁК00020000 1"10<2=2=2=2=2=2=2>2жедемнИЁЁЁК00000000 1"10D  
EEFмнмндеИЁЁЁК00000000 1"10LLдедемнИЁЁЁТББББВЮ1Я10 1"10TwLмнмндеИЁЁЁЁЁЁЁЁКжз0 1"100 !_"00LдедемнИЁЁЁЁЁЁЁЁКмн0 1!111111000LмнмндеИЁЁЁЁЁЁЁЁКде0(1)1)1)1)1)1*1000TдедемнИЁЁўџўџўџКмнЮ1Я1Ю1Я1Ю1Я1Ю1Я1Ю1Я1Ю1Я1мнмнде000ќ§ќ§ќ§0дедедедедедедедедемнЮ1Я1Ю1ѓђѓђѓђЯ1мнмнмнмнмнмнмнмнмн

BIN
data/layouts/RustboroCity/map.bin
View File

Binary file not shown.

2
data/layouts/layouts.json
View File

@@ -2417,7 +2417,7 @@
"width": 58,
"height": 26,
"primary_tileset": "gTileset_General",
"secondary_tileset": "0",
"secondary_tileset": "gTileset_Petalburg",
"border_filepath": "data/layouts/UnusedOutdoorArea/border.bin",
"blockdata_filepath": "data/layouts/UnusedOutdoorArea/map.bin"
},

2
data/map_events.s
View File

@@ -12,10 +12,10 @@
#include "constants/trainer_hill.h"
#include "constants/trainer_types.h"
#include "constants/berry.h"
#include "constants/species.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.include "data/maps/events.inc"

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

@@ -67,7 +67,7 @@
"flag": "FLAG_CAVE_MOONSTONE"
},
{
"graphics_id": "OBJ_EVENT_GFX_ANABEL",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_MEWTWO",
"x": 7,
"y": 2,
"elevation": 0,

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

@@ -15,7 +15,7 @@
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_REGISTEEL",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_REGISTEEL",
"x": 8,
"y": 3,
"elevation": 3,

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

@@ -55,6 +55,7 @@ AncientTomb_EventScript_CaveEntranceSide::
end
AncientTomb_EventScript_Registeel::
bufferspeciesname 0, SPECIES_REGISTEEL
lock
faceplayer
waitse
@@ -83,4 +84,3 @@ AncientTomb_EventScript_RanFromRegisteel::
setvar VAR_0x8004, SPECIES_REGISTEEL
goto Common_EventScript_LegendaryFlewAway
end

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

@@ -15,11 +15,11 @@
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_REGISTEEL",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_REGIDRAGO",
"x": 8,
"y": 3,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",

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

@@ -15,11 +15,11 @@
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_REGIROCK",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_REGIELEKI",
"x": 8,
"y": 3,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_type": "MOVEMENT_TYPE_FACE_DOWN",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
@@ -132,7 +132,13 @@
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
@@ -28,7 +28,13 @@
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
@@ -89,7 +89,9 @@
"dest_warp_id": "1"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",

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

@@ -75,6 +75,7 @@ BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge::
frontier_checkairshow
special LoadPlayerParty
special HealPlayerParty
callnative UpdateFollowingPokemon
arena_save 0
playse SE_SAVE
waitse
@@ -133,6 +134,7 @@ BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge::
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleArenaLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
callnative RemoveFollowingPokemon
call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_PARTY_SIZE
@@ -194,6 +196,7 @@ BattleFrontier_BattleArenaLobby_EventScript_CancelChallengeSaveFailed::
BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge::
special LoadPlayerParty
callnative UpdateFollowingPokemon
BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge::
msgbox BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge, MSGBOX_DEFAULT
BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge::

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_REPORTER_M",
@@ -210,7 +210,13 @@
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

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

@@ -17,6 +17,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts::
.byte 0
BattleFrontier_BattleDomeBattleRoom_OnTransition:
setflag FLAG_TEMP_HIDE_FOLLOWER
dome_setopponentgfx
frontier_get FRONTIER_DATA_BATTLE_NUM
copyvar VAR_TEMP_F, VAR_RESULT
@@ -475,6 +476,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects::
call BattleFrontier_EventScript_SetBrainObjectGfx
setobjectxyperm LOCALID_OPPONENT, 13, 9
removeobject LOCALID_OPPONENT
delay 1
addobject LOCALID_OPPONENT
applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisibleFacingUp
BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects::

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

@@ -68,6 +68,7 @@ BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints::
dome_set DOME_DATA_WIN_STREAK_ACTIVE, TRUE
special LoadPlayerParty
special HealPlayerParty
callnative UpdateFollowingPokemon
goto BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle
BattleFrontier_BattleDomeLobby_EventScript_LostChallenge::
@@ -82,6 +83,7 @@ BattleFrontier_BattleDomeLobby_EventScript_LostChallenge::
dome_set DOME_DATA_ATTEMPTED_CHALLENGE, TRUE
special LoadPlayerParty
special HealPlayerParty
callnative UpdateFollowingPokemon
BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle::
dome_save 0
playse SE_SAVE
@@ -160,6 +162,7 @@ BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge::
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleDomeLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
callnative RemoveFollowingPokemon
call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_PARTY_SIZE
@@ -222,6 +225,7 @@ BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed::
BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge::
special LoadPlayerParty
callnative UpdateFollowingPokemon
BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge::
msgbox BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain, MSGBOX_DEFAULT
BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge::

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_TEALA",
@@ -44,6 +44,10 @@
"dest_warp_id": "1"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
@@ -119,7 +119,13 @@
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
@@ -109,7 +109,9 @@
"dest_warp_id": "2"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",

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

@@ -59,6 +59,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_GiveBattlePoints::
waitmessage
frontier_checkairshow
special LoadPlayerParty
callnative UpdateFollowingPokemon
factory_save 0
playse SE_SAVE
waitse
@@ -71,6 +72,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge::
waitmessage
frontier_checkairshow
special LoadPlayerParty
callnative UpdateFollowingPokemon
factory_set FACTORY_DATA_WIN_STREAK_ACTIVE, FALSE
factory_save 0
playse SE_SAVE
@@ -196,6 +198,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_CancelChallengeSaveFailed::
BattleFrontier_BattleFactoryLobby_EventScript_LoadPartyAndCancelChallenge::
special LoadPlayerParty
callnative UpdateFollowingPokemon
BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge::
msgbox BattleFrontier_BattleFactoryLobby_Text_LookForwardToNextVisit, MSGBOX_DEFAULT
release

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
@@ -28,7 +28,13 @@
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_VAR_1",
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_AZURILL",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_AZURILL",
"x": 13,
"y": 1,
"elevation": 3,
@@ -96,6 +96,10 @@
"dest_warp_id": "2"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_AZURILL",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_AZURILL",
"x": 3,
"y": 5,
"elevation": 0,
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_KIRLIA",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_KIRLIA",
"x": 12,
"y": 6,
"elevation": 0,
@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_PIKACHU",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_PICHU",
"x": 15,
"y": 5,
"elevation": 0,
@@ -80,7 +80,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_AZUMARILL",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_AZUMARILL",
"x": 13,
"y": 9,
"elevation": 0,
@@ -93,7 +93,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_WINGULL",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_MACHOP",
"x": 3,
"y": 10,
"elevation": 0,
@@ -136,6 +136,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_EXPERT_M",
@@ -116,7 +116,9 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",

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

@@ -76,6 +76,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge::
frontier_checkairshow
special LoadPlayerParty
special HealPlayerParty
callnative UpdateFollowingPokemon
palace_save 0
playse SE_SAVE
waitse
@@ -151,6 +152,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge::
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
callnative RemoveFollowingPokemon
call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_PARTY_SIZE
@@ -215,6 +217,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_CancelChallengeSaveFailed::
BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge::
special LoadPlayerParty
callnative LoadPlayerParty
BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge::
msgbox BattleFrontier_BattlePalaceLobby_Text_ReturnWhenFortified, MSGBOX_DEFAULT
BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge::
@@ -647,4 +650,3 @@ BattleFrontier_BattlePalaceLobby_Text_ExplainRulesWhenInDanger:
.string "nature when it is in trouble.\p"
.string "If a POKéMON begins behaving oddly\n"
.string "in a pinch, watch it carefully.$"

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

@@ -12,7 +12,7 @@
"allow_running": true,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
@@ -28,7 +28,13 @@
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
@@ -90,7 +90,9 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",

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

@@ -59,6 +59,7 @@ BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints::
pike_set PIKE_DATA_TOTAL_STREAKS, VAR_RESULT
special LoadPlayerParty
special HealPlayerParty
callnative UpdateFollowingPokemon
pike_resethelditems
message BattleFrontier_BattlePikeLobby_Text_ShallRecordResults
waitmessage
@@ -80,6 +81,7 @@ BattleFrontier_BattlePikeLobby_EventScript_LostChallenge::
pike_set PIKE_DATA_WIN_STREAK_ACTIVE, FALSE
special LoadPlayerParty
special HealPlayerParty
callnative UpdateFollowingPokemon
pike_resethelditems
pike_save 0
playse SE_SAVE
@@ -119,6 +121,7 @@ BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge::
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
callnative RemoveFollowingPokemon
call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_PARTY_SIZE
@@ -183,6 +186,7 @@ BattleFrontier_BattlePikeLobby_EventScript_CancelChallengeSaveFailed::
BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge::
special LoadPlayerParty
callnative UpdateFollowingPokemon
BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge::
msgbox BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou, MSGBOX_DEFAULT
BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge::
@@ -430,4 +434,3 @@ BattleFrontier_BattlePikeLobby_Text_ExplainMonOrderRules:
.string "changed.\p"
.string "The sequence must be set before\n"
.string "starting your challenge.$"

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

@@ -12,7 +12,7 @@
"allow_running": true,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
@@ -28,7 +28,13 @@
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": true,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
@@ -41,7 +41,9 @@
"flag": "0"
}
],
"warp_events": [],
"warp_events": [
],
"coord_events": [
{
"type": "trigger",
@@ -107,5 +109,7 @@
"script": "BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack"
}
],
"bg_events": []
"bg_events": [
]
}

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

@@ -12,9 +12,13 @@
"allow_running": true,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"object_events": [],
"warp_events": [],
"connections": 0,
"object_events": [
],
"warp_events": [
],
"coord_events": [
{
"type": "trigger",
@@ -80,5 +84,7 @@
"script": "BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack"
}
],
"bg_events": []
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": true,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_LINK_RECEPTIONIST",
@@ -41,7 +41,9 @@
"flag": "0"
}
],
"warp_events": [],
"warp_events": [
],
"coord_events": [
{
"type": "trigger",
@@ -125,5 +127,7 @@
"script": "BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack"
}
],
"bg_events": []
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": true,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
@@ -223,7 +223,13 @@
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_HIKER",
@@ -76,7 +76,9 @@
"dest_warp_id": "3"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",

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

@@ -59,6 +59,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints::
special LoadPlayerParty
pyramid_clearhelditems
special HealPlayerParty
callnative UpdateFollowingPokemon
message BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept
waitmessage
playse SE_EXP_MAX
@@ -83,6 +84,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge::
special LoadPlayerParty
pyramid_clearhelditems
special HealPlayerParty
callnative UpdateFollowingPokemon
lockall
message BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag
waitmessage
@@ -132,6 +134,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge::
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
callnative RemoveFollowingPokemon
call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_PARTY_SIZE
@@ -196,6 +199,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed::
BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge::
special LoadPlayerParty
callnative UpdateFollowingPokemon
BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge::
msgbox BattleFrontier_BattlePyramidLobby_Text_AwaitFutureChallenge, MSGBOX_DEFAULT
BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge::
@@ -900,4 +904,3 @@ BattleFrontier_BattlePyramidLobby_Text_ExplainBagRules:
.string "of ten kinds of items.\p"
.string "The contents of the BATTLE BAG are\n"
.string "lost if you fail in your quest.$"

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

@@ -12,7 +12,7 @@
"allow_running": true,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_HIKER",
@@ -41,7 +41,9 @@
"flag": "0"
}
],
"warp_events": [],
"warp_events": [
],
"coord_events": [
{
"type": "trigger",
@@ -53,5 +55,7 @@
"script": "BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon"
}
],
"bg_events": []
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_FRONTIER",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_VAR_0",
@@ -70,6 +70,10 @@
"dest_warp_id": "2"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_TEALA",
@@ -28,7 +28,13 @@
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

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

@@ -95,6 +95,7 @@ BattleFrontier_BattleTowerLobby_EventScript_LookForwardToChallenge::
msgbox BattleFrontier_BattleTowerLobby_Text_LookForwardToAnotherChallenge, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_0, 255
callnative UpdateFollowingPokemon
release
end
@@ -114,6 +115,7 @@ BattleFrontier_BattleTowerLobby_EventScript_LostThanksForPlaying::
msgbox BattleFrontier_BattleTowerLobby_Text_LookForwardToAnotherChallenge, MSGBOX_DEFAULT
closemessage
setvar VAR_TEMP_0, 255
callnative UpdateFollowingPokemon
release
end
@@ -200,6 +202,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterSinglesChallenge::
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleTowerLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
callnative RemoveFollowingPokemon
call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_PARTY_SIZE
@@ -263,6 +266,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterDoublesChallenge::
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectFourMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
callnative RemoveFollowingPokemon
call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_DOUBLES_PARTY_SIZE
@@ -327,6 +331,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterMultisChallenge::
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
callnative RemoveFollowingPokemon
call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE
@@ -390,6 +395,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterLinkMultisChallenge::
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons2, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK
callnative RemoveFollowingPokemon
call BattleFrontier_EventScript_GetLvlMode
copyvar VAR_0x8004, VAR_RESULT
setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE
@@ -577,6 +583,7 @@ BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed::
BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge::
special LoadPlayerParty
callnative UpdateFollowingPokemon
BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge::
special CloseLink
msgbox BattleFrontier_BattleTowerLobby_Text_LookForwardToAnotherChallenge, MSGBOX_DEFAULT

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

@@ -177,7 +177,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2",
"graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_1",
"x": 40,
"y": 56,
"elevation": 3,
@@ -359,7 +359,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_MEOWTH_DOLL",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_MEOWTH",
"x": 64,
"y": 59,
"elevation": 0,
@@ -383,6 +383,123 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_UnusedRubyMap3_BonslyMunchEvo",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 5,
"y": 51,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": -3,
"y": 51,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 35,
"y": 10,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 10,
"y": 26,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 46,
"y": 55,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 44,
"y": 55,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 39,
"y": 28,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 16,
"y": 13,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 58,
"y": 13,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [

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

@@ -442,6 +442,7 @@ BattleFrontier_OutsideEast_Text_StickyMonWithLongTail:
BattleFrontier_MoneyFarm01::
lock
faceplayer
setflag FLAG_SYS_NO_CATCHING
setflag FLAG_DAILY_MONEYFARM
setflag FLAG_SYS_SET_BATTLE_BGM

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

@@ -344,6 +344,175 @@
"trainer_sight_or_berry_tree_id": "ITEM_TIMID_MINT",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_MINT_BF"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 53,
"y": 51,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 26,
"y": 47,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 26,
"y": 52,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 26,
"y": 57,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 26,
"y": 63,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 61,
"y": 51,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 43,
"y": 24,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 41,
"y": 24,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 21,
"y": 13,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 17,
"y": 13,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 18,
"y": 13,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 19,
"y": 13,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 20,
"y": 13,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_NURSE",
@@ -67,7 +67,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_SKITTY",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_SKITTY",
"x": 1,
"y": 3,
"elevation": 3,
@@ -103,6 +103,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_TEALA",
@@ -70,7 +70,9 @@
"dest_warp_id": "4"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",

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

@@ -15,9 +15,9 @@
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_REGICE",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_REGIGIGAS",
"x": 30,
"y": 30,
"y": 31,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,

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

@@ -15,7 +15,7 @@
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_REGIROCK",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_REGIROCK",
"x": 8,
"y": 3,
"elevation": 3,

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

@@ -55,6 +55,7 @@ DesertRuins_EventScript_CaveEntranceSide::
end
DesertRuins_EventScript_Regirock::
bufferspeciesname 0, SPECIES_REGIROCK
lock
faceplayer
waitse
@@ -83,4 +84,3 @@ DesertRuins_EventScript_RanFromRegirock::
setvar VAR_0x8004, SPECIES_REGIROCK
goto Common_EventScript_LegendaryFlewAway
end

13
data/maps/DewfordTown/map.json
View File

@@ -89,6 +89,19 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "DewfordTown_EventScript_TrendyPhraseBoy",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 4,
"y": 10,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_GIRL_2",
@@ -148,7 +148,9 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_WOMAN_3",
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2",
"graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_1",
"x": 4,
"y": 2,
"elevation": 3,
@@ -70,6 +70,10 @@
"dest_warp_id": "3"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_MAN_3",
@@ -57,6 +57,10 @@
"dest_warp_id": "4"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_NURSE",
@@ -77,6 +77,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_TEALA",
@@ -90,6 +90,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -20,7 +20,19 @@
}
],
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 29,
"y": 48,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [
{

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_DRAKE",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_DRAKE",
@@ -44,6 +44,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GLACIA",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_GLACIA",
@@ -44,6 +44,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,8 +12,10 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"object_events": [],
"connections": 0,
"object_events": [
],
"warp_events": [
{
"x": 5,
@@ -44,6 +46,10 @@
"dest_warp_id": "1"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,8 +12,10 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"object_events": [],
"connections": 0,
"object_events": [
],
"warp_events": [
{
"x": 5,
@@ -44,6 +46,10 @@
"dest_warp_id": "1"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,8 +12,10 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"object_events": [],
"connections": 0,
"object_events": [
],
"warp_events": [
{
"x": 5,
@@ -44,6 +46,10 @@
"dest_warp_id": "1"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,8 +12,10 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"object_events": [],
"connections": 0,
"object_events": [
],
"warp_events": [
{
"x": 5,
@@ -30,6 +32,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,8 +12,10 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"object_events": [],
"connections": 0,
"object_events": [
],
"warp_events": [
{
"x": 5,
@@ -44,6 +46,10 @@
"dest_warp_id": "2"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_WALLACE",
@@ -37,6 +37,10 @@
"dest_warp_id": "1"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_PHOEBE",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_PHOEBE",
@@ -44,6 +44,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_TEALA",
@@ -90,6 +90,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_TEALA",
@@ -90,6 +90,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_SIDNEY",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_SIDNEY",
@@ -44,6 +44,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

39
data/maps/FallarborTown/map.json
View File

@@ -76,6 +76,45 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_EventScript_Azurill",
"flag": "FLAG_HIDE_FALLARBOR_AZURILL"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 16,
"y": 7,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 17,
"y": 15,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 8,
"y": 5,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_VAR_1",
@@ -54,7 +54,13 @@
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
@@ -28,7 +28,13 @@
"flag": "0"
}
],
"warp_events": [],
"coord_events": [],
"bg_events": []
"warp_events": [
],
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
@@ -96,7 +96,9 @@
"dest_warp_id": "1"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_SCIENTIST_1",
@@ -57,6 +57,10 @@
"dest_warp_id": "3"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -54,7 +54,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_SKITTY",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_SKITTY",
"x": 3,
"y": 5,
"elevation": 3,

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_FAT_MAN",
@@ -44,6 +44,10 @@
"dest_warp_id": "4"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_NURSE",
@@ -90,6 +90,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_TEALA",
@@ -90,6 +90,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

26
data/maps/FortreeCity/map.json
View File

@@ -115,6 +115,32 @@
"trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_EventScript_Kecleon",
"flag": "FLAG_HIDE_FORTREE_CITY_KECLEON"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 7,
"y": 6,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "1",
"script": "NULL",
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_LIGHT_SPRITE",
"x": 6,
"y": 14,
"elevation": 0,
"movement_type": "MOVEMENT_TYPE_NONE",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "2",
"script": "NULL",
"flag": "0"
}
],
"warp_events": [

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_M",
@@ -83,6 +83,10 @@
"dest_warp_id": "8"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_GYM",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_WINONA",
@@ -135,7 +135,9 @@
"dest_warp_id": "2"
}
],
"coord_events": [],
"coord_events": [
],
"bg_events": [
{
"type": "sign",

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

@@ -5,6 +5,7 @@ FortreeCity_Gym_MapScripts::
FortreeCity_Gym_OnTransition:
special RotatingGate_InitPuzzle
setflag FLAG_TEMP_HIDE_FOLLOWER @ Hide follower bc of rotating gates
end
FortreeCity_Gym_OnWarp:

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

@@ -12,11 +12,11 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_NINJA_BOY",
"x": 1,
"x": 0,
"y": 3,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_RIGHT",
@@ -28,8 +28,8 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2",
"x": 2,
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_ZIGZAGOON",
"x": 1,
"y": 3,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_FACE_LEFT",
@@ -70,6 +70,10 @@
"dest_warp_id": "1"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_EXPERT_F",
@@ -57,6 +57,10 @@
"dest_warp_id": "4"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_MANIAC",
@@ -57,6 +57,10 @@
"dest_warp_id": "5"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_WOMAN_4",
@@ -41,7 +41,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_WINGULL",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_WINGULL",
"x": 2,
"y": 3,
"elevation": 3,
@@ -70,6 +70,10 @@
"dest_warp_id": "6"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_POKEFAN_F",
@@ -28,7 +28,7 @@
"flag": "0"
},
{
"graphics_id": "OBJ_EVENT_GFX_ZIGZAGOON_2",
"graphics_id": "OBJ_EVENT_GFX_MON_BASE+SPECIES_ZIGZAGOON",
"x": 6,
"y": 3,
"elevation": 3,
@@ -70,6 +70,10 @@
"dest_warp_id": "7"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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

@@ -12,7 +12,7 @@
"allow_running": false,
"show_map_name": false,
"battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": null,
"connections": 0,
"object_events": [
{
"graphics_id": "OBJ_EVENT_GFX_TEALA",
@@ -90,6 +90,10 @@
"dest_warp_id": "0"
}
],
"coord_events": [],
"bg_events": []
"coord_events": [
],
"bg_events": [
]
}

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