ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-19 09:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
pokeemerald/data/maps
History
Eduardo Quezada afcc1178b2 Merge remote-tracking branch 'pret/master' into MergedBranchUltimate 
# Conflicts:
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	include/battle_controllers.h
#	include/battle_script_commands.h
#	include/battle_util.h
#	include/constants/battle_script_commands.h
#	include/constants/global.h
#	include/decompress.h
#	src/battle_anim_effects_1.c
#	src/battle_anim_normal.c
#	src/battle_anim_poison.c
#	src/battle_anim_water.c
#	src/battle_arena.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_safari.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/berry.c
#	src/data/trainers.h
#	src/decompress.c
#	src/field_effect.c
#	src/hall_of_fame.c
#	src/overworld.c
#	src/pokeball.c
#	src/pokemon.c
#	src/pokemon_icon.c
#	src/pokemon_storage_system.c
#	src/scrcmd.c
2022-08-22 20:30:45 -04:00
..
AbandonedShip_CaptainsOffice
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
AbandonedShip_Corridors_1F
Remove address comments
2021-07-20 15:18:31 -04:00
AbandonedShip_Corridors_B1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
AbandonedShip_Deck
Remove address comments
2021-07-20 15:18:31 -04:00
AbandonedShip_HiddenFloorCorridors
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -08:00
AbandonedShip_HiddenFloorRooms
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -08:00
AbandonedShip_Room_B1F
Remove address comments
2021-07-20 15:18:31 -04:00
AbandonedShip_Rooms2_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
AbandonedShip_Rooms2_B1F
Remove address comments
2021-07-20 15:18:31 -04:00
AbandonedShip_Rooms_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
AbandonedShip_Rooms_B1F
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
AbandonedShip_Underwater1
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
AbandonedShip_Underwater2
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
AlteringCave
Remove address comments
2021-07-20 15:18:31 -04:00
AncientTomb
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
AquaHideout_1F
Remove address comments
2021-07-20 15:18:31 -04:00
AquaHideout_B1F
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
AquaHideout_B2F
Rename movement scripts to use Faster over Fastest
2021-11-05 02:22:28 +08:00
AquaHideout_UnusedRubyMap1
Remove address comments
2021-07-20 15:18:31 -04:00
AquaHideout_UnusedRubyMap2
Remove address comments
2021-07-20 15:18:31 -04:00
AquaHideout_UnusedRubyMap3
Remove address comments
2021-07-20 15:18:31 -04:00
ArtisanCave_1F
Remove address comments
2021-07-20 15:18:31 -04:00
ArtisanCave_B1F
Remove address comments
2021-07-20 15:18:31 -04:00
BattleColosseum_2P
Remove address comments
2021-07-20 15:18:31 -04:00
BattleColosseum_4P
Remove address comments
2021-07-20 15:18:31 -04:00
BattleFrontier_BattleArenaBattleRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleArenaCorridor
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
BattleFrontier_BattleArenaLobby
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleDomeBattleRoom
Supplant https://github.com/pret/pokeemerald/pull/1579
2022-06-18 21:51:05 -03:00
BattleFrontier_BattleDomeCorridor
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleDomeLobby
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleDomePreBattleRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleFactoryBattleRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleFactoryLobby
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleFactoryPreBattleRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattlePalaceBattleRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattlePalaceCorridor
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattlePalaceLobby
Fixed instances of .string being used with spaces instead of tabs
2022-08-15 14:32:01 -04:00
BattleFrontier_BattlePikeCorridor
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
BattleFrontier_BattlePikeLobby
Format newline in BattleBattleFrontier_BattlePikeLobby/scripts.inc
2022-06-18 11:49:13 -03:00
BattleFrontier_BattlePikeRoomFinal
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
BattleFrontier_BattlePikeRoomNormal
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
BattleFrontier_BattlePikeRoomWildMons
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattlePikeThreePathRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattlePyramidFloor
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattlePyramidLobby
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattlePyramidTop
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleTowerBattleRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleTowerCorridor
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleTowerElevator
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleTowerLobby
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleTowerMultiBattleRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleTowerMultiCorridor
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_BattleTowerMultiPartnerRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_ExchangeServiceCorner
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_Lounge1
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_Lounge2
Additional constant usage
2022-06-13 03:21:20 -04:00
BattleFrontier_Lounge3
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_Lounge4
Remove address comments
2021-07-20 15:18:31 -04:00
BattleFrontier_Lounge5
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_Lounge6
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_Lounge7
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_Lounge8
Remove address comments
2021-07-20 15:18:31 -04:00
BattleFrontier_Lounge9
Remove address comments
2021-07-20 15:18:31 -04:00
BattleFrontier_Mart
Remove address comments
2021-07-20 15:18:31 -04:00
BattleFrontier_OutsideEast
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
BattleFrontier_OutsideWest
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_PokemonCenter_1F
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
BattleFrontier_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
BattleFrontier_RankingHall
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattleFrontier_ReceptionGate
Rename movement scripts to use Faster over Fastest
2021-11-05 02:22:28 +08:00
BattleFrontier_ScottsHouse
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
BattlePyramidSquare01
Remove address comments
2021-07-20 15:18:31 -04:00
BattlePyramidSquare02
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare03
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare04
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare05
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare06
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare07
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare08
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare09
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare10
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare11
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare12
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare13
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare14
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare15
Use trainer type constants
2020-04-28 19:59:08 -05:00
BattlePyramidSquare16
Use trainer type constants
2020-04-28 19:59:08 -05:00
BirthIsland_Exterior
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
BirthIsland_Harbor
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
CaveOfOrigin_1F
Remove address comments
2021-07-20 15:18:31 -04:00
CaveOfOrigin_B1F
Rename movement scripts to use Faster over Fastest
2021-11-05 02:22:28 +08:00
CaveOfOrigin_Entrance
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
CaveOfOrigin_UnusedRubySapphireMap1
Remove address comments
2021-07-20 15:18:31 -04:00
CaveOfOrigin_UnusedRubySapphireMap2
Remove address comments
2021-07-20 15:18:31 -04:00
CaveOfOrigin_UnusedRubySapphireMap3
Remove address comments
2021-07-20 15:18:31 -04:00
ContestHall
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
ContestHallBeauty
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
ContestHallCool
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
ContestHallCute
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
ContestHallSmart
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
ContestHallTough
Give songs meaningful english names
2020-08-20 19:06:14 -04:00
DesertRuins
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
DesertUnderpass
Remove address comments
2021-07-20 15:18:31 -04:00
DewfordTown
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
DewfordTown_Gym
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
DewfordTown_Hall
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
DewfordTown_House1
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
DewfordTown_House2
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
DewfordTown_PokemonCenter_1F
Remove address comments
2021-07-20 15:18:31 -04:00
DewfordTown_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
EverGrandeCity
Remove address comments
2021-07-20 15:18:31 -04:00
EverGrandeCity_ChampionsRoom
Corrected additional inconsistent uses of whitespace
2022-08-15 17:04:34 -04:00
EverGrandeCity_DrakesRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
EverGrandeCity_GlaciasRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
EverGrandeCity_Hall1
Remove address comments
2021-07-20 15:18:31 -04:00
EverGrandeCity_Hall2
Remove address comments
2021-07-20 15:18:31 -04:00
EverGrandeCity_Hall3
Remove address comments
2021-07-20 15:18:31 -04:00
EverGrandeCity_Hall4
Remove address comments
2021-07-20 15:18:31 -04:00
EverGrandeCity_Hall5
Remove address comments
2021-07-20 15:18:31 -04:00
EverGrandeCity_HallOfFame
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
EverGrandeCity_PhoebesRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
EverGrandeCity_PokemonCenter_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
EverGrandeCity_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
EverGrandeCity_PokemonLeague_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
EverGrandeCity_PokemonLeague_2F
Remove address comments
2021-07-20 15:18:31 -04:00
EverGrandeCity_SidneysRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
FallarborTown
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
FallarborTown_BattleTentBattleRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
FallarborTown_BattleTentCorridor
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
FallarborTown_BattleTentLobby
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
FallarborTown_CozmosHouse
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
FallarborTown_Mart
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-27 21:40:08 -08:00
FallarborTown_MoveRelearnersHouse
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
FallarborTown_PokemonCenter_1F
Remove address comments
2021-07-20 15:18:31 -04:00
FallarborTown_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
FarawayIsland_Entrance
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
FarawayIsland_Interior
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
FieryPath
Remove address comments
2021-07-20 15:18:31 -04:00
FortreeCity
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
FortreeCity_DecorationShop
Corrected additional inconsistent uses of whitespace
2022-08-15 17:04:34 -04:00
FortreeCity_Gym
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
FortreeCity_House1
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
FortreeCity_House2
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
FortreeCity_House3
Remove address comments
2021-07-20 15:18:31 -04:00
FortreeCity_House4
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
FortreeCity_House5
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
FortreeCity_Mart
Remove address comments
2021-07-20 15:18:31 -04:00
FortreeCity_PokemonCenter_1F
Remove address comments
2021-07-20 15:18:31 -04:00
FortreeCity_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
GraniteCave_1F
Remove address comments
2021-07-20 15:18:31 -04:00
GraniteCave_B1F
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
GraniteCave_B2F
Remove address comments
2021-07-20 15:18:31 -04:00
GraniteCave_StevensRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
InsideOfTruck
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
IslandCave
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
JaggedPass
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LavaridgeTown
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LavaridgeTown_Gym_1F
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
LavaridgeTown_Gym_B1F
Remove address comments
2021-07-20 15:18:31 -04:00
LavaridgeTown_HerbShop
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LavaridgeTown_House
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
LavaridgeTown_Mart
Remove address comments
2021-07-20 15:18:31 -04:00
LavaridgeTown_PokemonCenter_1F
Remove address comments
2021-07-20 15:18:31 -04:00
LavaridgeTown_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
LilycoveCity
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_ContestHall
Remove address comments
2021-07-20 15:18:31 -04:00
LilycoveCity_ContestLobby
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-11-21 10:41:32 -08:00
LilycoveCity_CoveLilyMotel_1F
Rename movement scripts to use Faster over Fastest
2021-11-05 02:22:28 +08:00
LilycoveCity_CoveLilyMotel_2F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_DepartmentStore_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_DepartmentStore_2F
Remove address comments
2021-07-20 15:18:31 -04:00
LilycoveCity_DepartmentStore_3F
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-11 17:10:57 -07:00
LilycoveCity_DepartmentStore_4F
Remove address comments
2021-07-20 15:18:31 -04:00
LilycoveCity_DepartmentStore_5F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_DepartmentStoreElevator
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_DepartmentStoreRooftop
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_Harbor
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_House1
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
LilycoveCity_House2
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_House3
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_House4
Remove address comments
2021-07-20 15:18:31 -04:00
LilycoveCity_LilycoveMuseum_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_LilycoveMuseum_2F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_MoveDeletersHouse
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_PokemonCenter_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
LilycoveCity_PokemonTrainerFanClub
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LilycoveCity_UnusedMart
Remove address comments
2021-07-20 15:18:31 -04:00
LittlerootTown
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LittlerootTown_BrendansHouse_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LittlerootTown_BrendansHouse_2F
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
LittlerootTown_MaysHouse_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
LittlerootTown_MaysHouse_2F
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
LittlerootTown_ProfessorBirchsLab
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
MagmaHideout_1F
Remove address comments
2021-07-20 15:18:31 -04:00
MagmaHideout_2F_1R
Remove address comments
2021-07-20 15:18:31 -04:00
MagmaHideout_2F_2R
Remove address comments
2021-07-20 15:18:31 -04:00
MagmaHideout_2F_3R
Remove address comments
2021-07-20 15:18:31 -04:00
MagmaHideout_3F_1R
Remove address comments
2021-07-20 15:18:31 -04:00
MagmaHideout_3F_2R
Remove address comments
2021-07-20 15:18:31 -04:00
MagmaHideout_3F_3R
Remove address comments
2021-07-20 15:18:31 -04:00
MagmaHideout_4F
Rename movement scripts to use Faster over Fastest
2021-11-05 02:22:28 +08:00
MarineCave_End
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
MarineCave_Entrance
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
MauvilleCity
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MauvilleCity_BikeShop
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MauvilleCity_GameCorner
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MauvilleCity_Gym
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MauvilleCity_House1
Remove address comments
2021-07-20 15:18:31 -04:00
MauvilleCity_House2
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MauvilleCity_Mart
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-11 17:10:57 -07:00
MauvilleCity_PokemonCenter_1F
Clean up mauville_old_man, drop ScrSpecial prefix
2021-10-18 01:09:41 -04:00
MauvilleCity_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
MeteorFalls_1F_1R
More updating event macro comments
2021-11-16 17:46:34 -05:00
MeteorFalls_1F_2R
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MeteorFalls_B1F_1R
Remove address comments
2021-07-20 15:18:31 -04:00
MeteorFalls_B1F_2R
Remove address comments
2021-07-20 15:18:31 -04:00
MeteorFalls_StevensCave
Remove address comments
2021-07-20 15:18:31 -04:00
MirageTower_1F
Remove address comments
2021-07-20 15:18:31 -04:00
MirageTower_2F
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
MirageTower_3F
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
MirageTower_4F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MossdeepCity
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MossdeepCity_GameCorner_1F
Remove address comments
2021-07-20 15:18:31 -04:00
MossdeepCity_GameCorner_B1F
Remove address comments
2021-07-20 15:18:31 -04:00
MossdeepCity_Gym
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MossdeepCity_House1
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MossdeepCity_House2
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MossdeepCity_House3
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MossdeepCity_House4
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MossdeepCity_Mart
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-11 17:10:57 -07:00
MossdeepCity_PokemonCenter_1F
Remove address comments
2021-07-20 15:18:31 -04:00
MossdeepCity_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
MossdeepCity_SpaceCenter_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MossdeepCity_SpaceCenter_2F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MossdeepCity_StevensHouse
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
MtChimney
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MtChimney_CableCarStation
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MtPyre_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MtPyre_2F
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
MtPyre_3F
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
MtPyre_4F
Remove address comments
2021-07-20 15:18:31 -04:00
MtPyre_5F
Remove address comments
2021-07-20 15:18:31 -04:00
MtPyre_6F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MtPyre_Exterior
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
MtPyre_Summit
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
NavelRock_B1F
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Bottom
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
NavelRock_Down01
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Down02
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Down03
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Down04
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Down05
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Down06
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Down07
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Down08
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Down09
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Down10
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Down11
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Entrance
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Exterior
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Fork
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Harbor
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
NavelRock_Top
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
NavelRock_Up1
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Up2
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Up3
Remove address comments
2021-07-20 15:18:31 -04:00
NavelRock_Up4
Remove address comments
2021-07-20 15:18:31 -04:00
NewMauville_Entrance
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
NewMauville_Inside
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
OldaleTown
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
OldaleTown_House1
Remove address comments
2021-07-20 15:18:31 -04:00
OldaleTown_House2
Remove address comments
2021-07-20 15:18:31 -04:00
OldaleTown_Mart
Add align directives to all marts
2021-08-04 11:50:33 -04:00
OldaleTown_PokemonCenter_1F
Remove address comments
2021-07-20 15:18:31 -04:00
OldaleTown_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
PacifidlogTown
Remove address comments
2021-07-20 15:18:31 -04:00
PacifidlogTown_House1
Remove address comments
2021-07-20 15:18:31 -04:00
PacifidlogTown_House2
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
PacifidlogTown_House3
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
PacifidlogTown_House4
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
PacifidlogTown_House5
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
PacifidlogTown_PokemonCenter_1F
Remove address comments
2021-07-20 15:18:31 -04:00
PacifidlogTown_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
PetalburgCity
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
PetalburgCity_Gym
Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync"
2021-12-10 09:41:54 -08:00
PetalburgCity_House1
Remove address comments
2021-07-20 15:18:31 -04:00
PetalburgCity_House2
Remove address comments
2021-07-20 15:18:31 -04:00
PetalburgCity_Mart
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-11 17:10:57 -07:00
PetalburgCity_PokemonCenter_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
PetalburgCity_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
PetalburgCity_WallysHouse
Remove address comments
2021-07-20 15:18:31 -04:00
PetalburgWoods
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
RecordCorner
Remove address comments
2021-07-20 15:18:31 -04:00
Route101
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route102
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route103
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route104
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route104_MrBrineysHouse
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route104_PrettyPetalFlowerShop
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route104_Prototype
Remove address comments
2021-07-20 15:18:31 -04:00
Route104_PrototypePrettyPetalFlowerShop
Remove address comments
2021-07-20 15:18:31 -04:00
Route105
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route106
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route107
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route108
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route109
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route109_SeashoreHouse
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route110
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -08:00
Route110_SeasideCyclingRoadNorthEntrance
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route110_SeasideCyclingRoadSouthEntrance
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route110_TrickHouseCorridor
Remove address comments
2021-07-20 15:18:31 -04:00
Route110_TrickHouseEnd
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route110_TrickHouseEntrance
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route110_TrickHousePuzzle1
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route110_TrickHousePuzzle2
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route110_TrickHousePuzzle3
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route110_TrickHousePuzzle4
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route110_TrickHousePuzzle5
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route110_TrickHousePuzzle6
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route110_TrickHousePuzzle7
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route110_TrickHousePuzzle8
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route111
Clean up lock/unlock anim movement
2022-08-12 21:18:10 -04:00
Route111_OldLadysRestStop
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route111_WinstrateFamilysHouse
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route112
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route112_CableCarStation
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route113
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route113_GlassWorkshop
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route114
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route114_FossilManiacsHouse
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route114_FossilManiacsTunnel
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route114_LanettesHouse
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route115
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route116
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route116_TunnelersRestHouse
Remove address comments
2021-07-20 15:18:31 -04:00
Route117
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route117_PokemonDayCare
Remove address comments
2021-07-20 15:18:31 -04:00
Route118
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route119
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route119_House
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
Route119_WeatherInstitute_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route119_WeatherInstitute_2F
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
Route120
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
Route121
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route121_SafariZoneEntrance
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route122
Remove address comments
2021-07-20 15:18:31 -04:00
Route123
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route123_BerryMastersHouse
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route124
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route124_DivingTreasureHuntersHouse
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route125
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route126
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route127
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route128
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route129
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route130
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route131
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Route132
Remove address comments
2021-07-20 15:18:31 -04:00
Route133
Remove address comments
2021-07-20 15:18:31 -04:00
Route134
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
RustboroCity
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
RustboroCity_CuttersHouse
Remove address comments
2021-07-20 15:18:31 -04:00
RustboroCity_DevonCorp_1F
Remove address comments
2021-07-20 15:18:31 -04:00
RustboroCity_DevonCorp_2F
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
RustboroCity_DevonCorp_3F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
RustboroCity_Flat1_1F
Remove address comments
2021-07-20 15:18:31 -04:00
RustboroCity_Flat1_2F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
RustboroCity_Flat2_1F
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
RustboroCity_Flat2_2F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
RustboroCity_Flat2_3F
Remove address comments
2021-07-20 15:18:31 -04:00
RustboroCity_Gym
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
RustboroCity_House1
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
RustboroCity_House2
Remove address comments
2021-07-20 15:18:31 -04:00
RustboroCity_House3
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
RustboroCity_Mart
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-11 17:10:57 -07:00
RustboroCity_PokemonCenter_1F
Remove address comments
2021-07-20 15:18:31 -04:00
RustboroCity_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
RustboroCity_PokemonSchool
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
RusturfTunnel
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -08:00
SafariZone_North
Remove address comments
2021-07-20 15:18:31 -04:00
SafariZone_Northeast
Remove address comments
2021-07-20 15:18:31 -04:00
SafariZone_Northwest
Remove address comments
2021-07-20 15:18:31 -04:00
SafariZone_RestHouse
Remove address comments
2021-07-20 15:18:31 -04:00
SafariZone_South
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SafariZone_Southeast
Remove address comments
2021-07-20 15:18:31 -04:00
SafariZone_Southwest
Remove address comments
2021-07-20 15:18:31 -04:00
ScorchedSlab
Remove address comments
2021-07-20 15:18:31 -04:00
SeafloorCavern_Entrance
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SeafloorCavern_Room1
Remove address comments
2021-07-20 15:18:31 -04:00
SeafloorCavern_Room2
Remove address comments
2021-07-20 15:18:31 -04:00
SeafloorCavern_Room3
Remove address comments
2021-07-20 15:18:31 -04:00
SeafloorCavern_Room4
Remove address comments
2021-07-20 15:18:31 -04:00
SeafloorCavern_Room5
Remove address comments
2021-07-20 15:18:31 -04:00
SeafloorCavern_Room6
Remove address comments
2021-07-20 15:18:31 -04:00
SeafloorCavern_Room7
Remove address comments
2021-07-20 15:18:31 -04:00
SeafloorCavern_Room8
Remove address comments
2021-07-20 15:18:31 -04:00
SeafloorCavern_Room9
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
SealedChamber_InnerRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SealedChamber_OuterRoom
More updating event macro comments
2021-11-16 17:46:34 -05:00
SecretBase_BlueCave1
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_BlueCave2
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_BlueCave3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_BlueCave4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_BrownCave1
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_BrownCave2
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_BrownCave3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_BrownCave4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_RedCave1
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_RedCave2
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_RedCave3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_RedCave4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_Shrub1
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_Shrub2
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_Shrub3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_Shrub4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_Tree1
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_Tree2
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_Tree3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_Tree4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_YellowCave1
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_YellowCave2
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_YellowCave3
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SecretBase_YellowCave4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
ShoalCave_HighTideEntranceRoom
Remove address comments
2021-07-20 15:18:31 -04:00
ShoalCave_HighTideInnerRoom
Remove address comments
2021-07-20 15:18:31 -04:00
ShoalCave_LowTideEntranceRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
ShoalCave_LowTideIceRoom
Remove address comments
2021-07-20 15:18:31 -04:00
ShoalCave_LowTideInnerRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
ShoalCave_LowTideLowerRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
ShoalCave_LowTideStairsRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SkyPillar_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SkyPillar_2F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SkyPillar_3F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SkyPillar_4F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SkyPillar_5F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SkyPillar_Entrance
Remove address comments
2021-07-20 15:18:31 -04:00
SkyPillar_Outside
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SkyPillar_Top
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SlateportCity
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SlateportCity_BattleTentBattleRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SlateportCity_BattleTentCorridor
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SlateportCity_BattleTentLobby
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SlateportCity_Harbor
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SlateportCity_House
Remove address comments
2021-07-20 15:18:31 -04:00
SlateportCity_Mart
Add align directives to all marts
2021-08-04 11:50:33 -04:00
SlateportCity_NameRatersHouse
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SlateportCity_OceanicMuseum_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SlateportCity_OceanicMuseum_2F
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -08:00
SlateportCity_PokemonCenter_1F
Remove address comments
2021-07-20 15:18:31 -04:00
SlateportCity_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
SlateportCity_PokemonFanClub
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SlateportCity_SternsShipyard_1F
Remove address comments
2021-07-20 15:18:31 -04:00
SlateportCity_SternsShipyard_2F
Remove address comments
2021-07-20 15:18:31 -04:00
SootopolisCity
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SootopolisCity_Gym_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SootopolisCity_Gym_B1F
Remove address comments
2021-07-20 15:18:31 -04:00
SootopolisCity_House1
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SootopolisCity_House2
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SootopolisCity_House3
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SootopolisCity_House4
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
SootopolisCity_House5
Remove address comments
2021-07-20 15:18:31 -04:00
SootopolisCity_House6
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SootopolisCity_House7
Remove address comments
2021-07-20 15:18:31 -04:00
SootopolisCity_LotadAndSeedotHouse
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SootopolisCity_Mart
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-12-01 20:18:57 -08:00
SootopolisCity_MysteryEventsHouse_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SootopolisCity_MysteryEventsHouse_B1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SootopolisCity_PokemonCenter_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SootopolisCity_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
SouthernIsland_Exterior
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SouthernIsland_Interior
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
SSTidalCorridor
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
SSTidalLowerDeck
Remove address comments
2021-07-20 15:18:31 -04:00
SSTidalRooms
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
TerraCave_End
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
2022-04-02 18:45:18 -03:00
TerraCave_Entrance
Remove address comments
2021-07-20 15:18:31 -04:00
TradeCenter
Remove address comments
2021-07-20 15:18:31 -04:00
TrainerHill_1F
Remove address comments
2021-07-20 15:18:31 -04:00
TrainerHill_2F
Remove address comments
2021-07-20 15:18:31 -04:00
TrainerHill_3F
Remove address comments
2021-07-20 15:18:31 -04:00
TrainerHill_4F
Remove address comments
2021-07-20 15:18:31 -04:00
TrainerHill_Elevator
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
TrainerHill_Entrance
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
2022-07-22 22:57:02 -04:00
TrainerHill_Roof
Remove address comments
2021-07-20 15:18:31 -04:00
Underwater_MarineCave
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
Underwater_Route105
Remove address comments
2021-07-20 15:18:31 -04:00
Underwater_Route124
Remove address comments
2021-07-20 15:18:31 -04:00
Underwater_Route125
Remove address comments
2021-07-20 15:18:31 -04:00
Underwater_Route126
Remove address comments
2021-07-20 15:18:31 -04:00
Underwater_Route127
Remove address comments
2021-07-20 15:18:31 -04:00
Underwater_Route128
Remove address comments
2021-07-20 15:18:31 -04:00
Underwater_Route129
Remove address comments
2021-07-20 15:18:31 -04:00
Underwater_Route134
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
Underwater_SeafloorCavern
More updating event macro comments
2021-11-16 17:46:34 -05:00
Underwater_SealedChamber
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
Underwater_SootopolisCity
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
UnionRoom
Remove address comments
2021-07-20 15:18:31 -04:00
UnusedContestHall1
Label unused layouts
2021-02-08 14:45:56 -05:00
UnusedContestHall2
Label unused layouts
2021-02-08 14:45:56 -05:00
UnusedContestHall3
Label unused layouts
2021-02-08 14:45:56 -05:00
UnusedContestHall4
Label unused layouts
2021-02-08 14:45:56 -05:00
UnusedContestHall5
Label unused layouts
2021-02-08 14:45:56 -05:00
UnusedContestHall6
Label unused layouts
2021-02-08 14:45:56 -05:00
VerdanturfTown
Remove address comments
2021-07-20 15:18:31 -04:00
VerdanturfTown_BattleTentBattleRoom
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
VerdanturfTown_BattleTentCorridor
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
VerdanturfTown_BattleTentLobby
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
VerdanturfTown_FriendshipRatersHouse
Add CRY_MODE constants
2021-11-07 13:33:05 -05:00
VerdanturfTown_House
Remove address comments
2021-07-20 15:18:31 -04:00
VerdanturfTown_Mart
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
2021-08-11 17:10:57 -07:00
VerdanturfTown_PokemonCenter_1F
Remove address comments
2021-07-20 15:18:31 -04:00
VerdanturfTown_PokemonCenter_2F
Remove address comments
2021-07-20 15:18:31 -04:00
VerdanturfTown_WandasHouse
Remove address comments
2021-07-20 15:18:31 -04:00
VictoryRoad_1F
Reformat compare + goto_if/call_if to single statements
2021-11-18 23:06:51 -05:00
VictoryRoad_B1F
Remove address comments
2021-07-20 15:18:31 -04:00
VictoryRoad_B2F
Remove address comments
2021-07-20 15:18:31 -04:00
.gitignore
Cleanup and add game version flag to mapjson tool
2019-02-04 17:28:45 -06:00
map_groups.json
Name map groups
2021-05-11 10:16:04 -05:00