LOuroboros
|
21244d6393
|
Modified and moved IsPinchBerryItemEffect
|
2022-01-26 21:45:24 -03:00 |
|
GriffinR
|
2efbd5f549
|
Merge pull request #1608 from GriffinRichards/fix-fieldmap
Fix some incorrect fieldmap names
|
2022-01-26 17:51:56 -05:00 |
|
GriffinR
|
2495d18132
|
Add missing :req, remove old macros
|
2022-01-23 18:52:04 -05:00 |
|
ghoulslash
|
bc94a2bb16
|
Merge pull request #1979 from AsparagusEduardo/BE_wildNaturalEnemies
Wild mon natural enemies in double wild battles
|
2022-01-23 18:43:12 -05:00 |
|
LOuroboros
|
8eaf0718ec
|
Review changes
Also updated tryfaintmon call in BattleScript_FlingEnd, and updated CanFling.
|
2022-01-23 19:13:04 -03:00 |
|
LOuroboros
|
a8a8c7e2fa
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
|
2022-01-23 02:37:07 -03:00 |
|
Eduardo Quezada D'Ottone
|
e880e4afdd
|
Merge branch 'battle_engine' into be_recalc_turn_order_after_actions
|
2022-01-22 19:01:45 -03:00 |
|
GriffinR
|
3d0326106e
|
Z coord / height -> elevation
|
2022-01-21 12:48:19 -05:00 |
|
GriffinR
|
79dfac92c9
|
Merge pull request #1604 from GriffinRichards/clean-spinda
Document Spinda spot algorithm
|
2022-01-21 09:55:43 -05:00 |
|
GriffinR
|
fb81d9ad4a
|
Correct map data comment
|
2022-01-20 23:26:39 -05:00 |
|
Eduardo Quezada D'Ottone
|
7d75e16312
|
Small documentation and cleanup
|
2022-01-20 12:25:48 -03:00 |
|
GriffinR
|
062cdbe01c
|
Merge pull request #1599 from GriffinRichards/fix-tilemaps
Break up graphics/interface and graphics/misc
|
2022-01-20 08:53:44 -05:00 |
|
GriffinR
|
a7e6045d71
|
Merge pull request #1597 from GriffinRichards/misc-cleanup
Miscellaneous fixes
|
2022-01-19 22:17:37 -05:00 |
|
GriffinR
|
c4f33f2b2b
|
TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE
|
2022-01-19 12:54:55 -05:00 |
|
GriffinR
|
e682c12519
|
sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE
|
2022-01-19 12:39:11 -05:00 |
|
GriffinR
|
8200fda14e
|
Fix decorations metatile attribute names
|
2022-01-19 10:56:54 -05:00 |
|
GriffinR
|
a8b466dc80
|
Disambiguate fieldmap names
|
2022-01-19 10:15:32 -05:00 |
|
GriffinR
|
f127e64a3c
|
Name overworld tilemaps for their bg, add layer type constants
|
2022-01-19 09:37:12 -05:00 |
|
GriffinR
|
225147a94f
|
Document Spinda spot algorithm
|
2022-01-17 15:34:18 -05:00 |
|
Eduardo Quezada D'Ottone
|
925f65c450
|
Realigned config to previous state
|
2022-01-16 21:10:09 -03:00 |
|
GriffinR
|
69759b2d12
|
Merge pull request #1601 from GriffinRichards/fix-decor-flag
Fix FLAG_DECORATION_0 name
|
2022-01-16 17:44:58 -05:00 |
|
LOuroboros
|
a4d31da923
|
Updated the value of MAX_MAP_DATA_SIZE
|
2022-01-16 19:22:28 -03:00 |
|
Eduardo Quezada D'Ottone
|
d40119010e
|
Merge branch 'BattleEngine' into BE_wildNaturalEnemies
# Conflicts:
# include/constants/battle_config.h
|
2022-01-16 16:23:12 -03:00 |
|
Eduardo Quezada D'Ottone
|
6aabe58649
|
Merge branch 'battle_engine' into magician
|
2022-01-15 13:06:13 -03:00 |
|
ghoulslash
|
46c2a9ada5
|
Merge pull request #2033 from LOuroboros/galarianZenMode
Allow Galarian Darmanitan's Zen Mode to work
|
2022-01-13 11:42:54 -05:00 |
|
ghoulslash
|
543252bc6c
|
Merge pull request #2034 from LOuroboros/proteanMsgboxFlush
Tweaked Protean's effect's InGame appearance
|
2022-01-13 11:42:31 -05:00 |
|
LOuroboros
|
a4f0de5106
|
Removed the last bits of HOLD_EFFECT_GRACIDEA
|
2022-01-12 01:54:29 -03:00 |
|
LOuroboros
|
b2965e5522
|
Added a pause to BattleScript_ProteanActivates
|
2022-01-11 20:15:47 -03:00 |
|
GriffinR
|
694aa3c65d
|
Move balls, shop, link, map popups, and bag out of interface
|
2022-01-11 13:53:23 -05:00 |
|
GriffinR
|
7103839a61
|
Move summary screen graphics out of interface, fix some names
|
2022-01-11 11:22:45 -05:00 |
|
GriffinR
|
fde18b4774
|
Fix berry crusher graphics name
|
2022-01-11 10:42:00 -05:00 |
|
GriffinR
|
0a78cb5c9e
|
Fix some battle dome graphics names
|
2022-01-11 10:04:47 -05:00 |
|
LOuroboros
|
24b5a5709a
|
Allow Galarian Darmanitan's Zen Mode to work
|
2022-01-10 23:01:18 -03:00 |
|
GriffinR
|
4024b3f1b3
|
Merge pull request #1590 from GriffinRichards/dex-enum
Convert pokedex defines to enums
|
2022-01-10 14:56:26 -05:00 |
|
GriffinR
|
8b920691e6
|
Fix FLAG_DECORATION_0 name
|
2022-01-09 01:31:42 -05:00 |
|
Eduardo Quezada D'Ottone
|
97baedbd5e
|
Merge pull request #1923 from WiserVisor/battle_engine
Added Sky Drop to Battle Engine
|
2022-01-07 18:14:40 -03:00 |
|
GriffinR
|
577e6cc740
|
Merge pull request #1586 from GriffinRichards/clean-areascreen
Clean up pokedex_area_screen
|
2022-01-06 23:02:23 -05:00 |
|
GriffinR
|
5d033c2e4d
|
Convert pokedex defines to enums
|
2022-01-05 12:18:49 -05:00 |
|
GriffinR
|
ce55e58ad8
|
Misc cleanup
|
2022-01-04 10:09:42 -05:00 |
|
Eduardo Quezada D'Ottone
|
221e38ff86
|
Merge pull request #1957 from ghoulslash/be/ability_popup
Ability Popup Fixes + Longer Ability Names config
|
2022-01-01 19:39:55 -03:00 |
|
GriffinR
|
23f5c9fd5c
|
Clean up pokedex_area_screen
|
2021-12-31 00:16:56 -05:00 |
|
Eduardo Quezada D'Ottone
|
5b54986e6b
|
Merge pull request #1980 from LOuroboros/multiBattles
Multi battle updates
|
2021-12-29 22:09:06 -03:00 |
|
GriffinR
|
aadab8b016
|
Move pokemon and easy chat constants to global, misc clean-up
|
2021-12-28 18:07:41 -05:00 |
|
LOuroboros
|
ce7815ebcc
|
Update pokemon.h
|
2021-12-28 15:11:52 -03:00 |
|
Eduardo Quezada D'Ottone
|
7bffe6d1d5
|
Merge pull request #2004 from ghoulslash/be/sports
Add sport effects back
|
2021-12-24 18:59:50 -03:00 |
|
ghoulslash
|
93a7e139ec
|
merge w be
|
2021-12-24 09:40:12 -05:00 |
|
Eduardo Quezada D'Ottone
|
2ebe427a42
|
Merge branch 'BattleEngine' into BE_wildNaturalEnemies
# Conflicts:
# src/battle_controller_opponent.c
|
2021-12-23 21:19:59 -03:00 |
|
ghoulslash
|
770224d341
|
increase TEXT_BUFF_ARRAY_COUNT for expanded ability names
|
2021-12-23 18:58:15 -05:00 |
|
WiserVisor
|
8923ffb3af
|
Merge branch 'battle_engine' into battle_engine
|
2021-12-23 15:29:10 -08:00 |
|
Eduardo Quezada D'Ottone
|
67697d2de3
|
Merge pull request #1582 from ghoulslash/smart_wild_ai
Smart Wild AI Option
|
2021-12-23 20:18:18 -03:00 |
|