Hedara
|
2844633403
|
Merge commit '89ca861a3af8b23bcd3db86fcea017a04ea82769' into pret-merge
Conflicts:
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
data/maps/BattleFrontier_Lounge1/scripts.inc
data/maps/BattleFrontier_Lounge5/scripts.inc
data/maps/BattleFrontier_Lounge6/scripts.inc
data/maps/BattleFrontier_Lounge7/scripts.inc
data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc
data/maps/FortreeCity_House1/scripts.inc
data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
data/maps/PacifidlogTown_House3/scripts.inc
data/maps/RustboroCity_House1/scripts.inc
data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
data/maps/SlateportCity_NameRatersHouse/scripts.inc
data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
data/scripts/day_care.inc
data/scripts/pc_transfer.inc
data/specials.inc
|
2026-05-15 16:40:56 +02:00 |
|
Frank DeBlasio
|
e587cff9dd
|
Refactor exchange service corner (#8840)
|
2026-01-11 18:31:38 +01:00 |
|
Martin Griffin
|
400788ddf6
|
Implicit waitstate for special/specialvars
|
2025-11-05 22:38:51 +00:00 |
|
GriffinR
|
e66ea0cb99
|
Reformat compare + goto_if/call_if to single statements
|
2021-11-18 23:06:51 -05:00 |
|
GriffinR
|
f85de6eca5
|
Start event macro comment updates
|
2021-11-15 10:54:57 -05:00 |
|
GriffinR
|
06351bf63c
|
Remove address comments
|
2021-07-20 15:18:31 -04:00 |
|
GriffinR
|
3014241179
|
Give songs meaningful english names
|
2020-08-20 19:06:14 -04:00 |
|
GriffinR
|
f2e7b1507e
|
Port some macro/script fixes from pokefirered
|
2020-01-11 14:12:31 -05:00 |
|
GriffinR
|
7beddd16dd
|
Document missed scripts/text
|
2019-12-05 21:20:55 -06:00 |
|
GriffinR
|
248b85c3cb
|
Document Frontier Exchange Corner scripts
|
2019-11-16 12:00:35 -06:00 |
|