GriffinR
|
d664135572
|
Add usage of battle strings table offset constant
|
2022-03-10 10:44:04 -05:00 |
|
SubzeroEclipse
|
d3589103b3
|
Fixed some move descriptions
|
2022-03-09 15:23:08 +01:00 |
|
ghoulslash
|
f53de6ae87
|
fix toxic/flame orb. use CanBeX'ed functions
|
2022-03-08 15:16:17 -05:00 |
|
GriffinR
|
b1d61b9227
|
Merge pull request #1641 from GriffinRichards/subsprite-arr-count
Use ARRAY_COUNT for obj event subsprite tables
|
2022-03-03 23:08:52 -05:00 |
|
GriffinR
|
f78f46a1e2
|
Use ARRAY_COUNT for obj event subsprite tables
|
2022-03-03 14:54:05 -05:00 |
|
GriffinR
|
8bf7e7b6f5
|
Improve egg hatch documentation
|
2022-03-03 01:33:49 -05:00 |
|
ultima-soul
|
86089ce935
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2022-02-28 22:13:14 -08:00 |
|
GriffinR
|
a2ee0c8393
|
Merge pull request #1639 from GriffinRichards/typo-hoppy
Fix bunny hoppy typo
|
2022-02-28 22:34:24 -05:00 |
|
GriffinR
|
5d58cdd297
|
Fix bunny hoppy typo
|
2022-02-28 13:34:39 -05:00 |
|
GriffinR
|
2142ad96d5
|
Merge pull request #1638 from GriffinRichards/menu-arr-count
Add missing menu array counts
|
2022-02-28 01:49:09 -05:00 |
|
GriffinR
|
3d0663fe81
|
Additional trader clean up
|
2022-02-27 13:58:48 -05:00 |
|
GriffinR
|
36e5d5e759
|
Add missing menu array counts
|
2022-02-27 13:47:50 -05:00 |
|
Eduardo Quezada D'Ottone
|
ed464a9e8d
|
Merge pull request #2068 from ghoulslash/be/strugglebug
Fix struggle bug anim
|
2022-02-25 12:50:55 -03:00 |
|
ghoulslash
|
7c2bbf1df3
|
fix struggle bug anim
|
2022-02-25 08:54:35 -05:00 |
|
ghoulslash
|
92487db470
|
add config check for B_GLARE_GHOST
|
2022-02-25 08:20:56 -05:00 |
|
ghoulslash
|
e4ef3cc3b4
|
move glare effectiveness exception to code
|
2022-02-24 22:06:18 -05:00 |
|
cbt6
|
f826a5a82d
|
Use constants for PC locations
|
2022-02-23 15:07:22 +08:00 |
|
sphericalice
|
40efac0ddf
|
Rename GetBattlePyramindTrainerEncounterMusicId to fix typo
|
2022-02-22 19:13:17 +00:00 |
|
GriffinR
|
eca5233abe
|
Merge pull request #1633 from abaresk/slot-cleanup
Clean up and document Slot Machines more
|
2022-02-20 17:59:14 -05:00 |
|
hondew
|
08bf2587ce
|
Fix typos
|
2022-02-20 17:47:24 -05:00 |
|
hondew
|
39fc1cd414
|
Switch to 'symbol' nomenclature
|
2022-02-20 17:02:37 -05:00 |
|
hondew
|
26e87eed0a
|
Address comments
|
2022-02-20 15:32:32 -05:00 |
|
hondew
|
a578fa5e2b
|
Minor fixes
|
2022-02-20 12:06:29 -05:00 |
|
hondew
|
50cb504d4c
|
Remove stuff
|
2022-02-20 10:15:07 -05:00 |
|
Abaresk
|
c39b0ff6d7
|
Document slot machine more (unabridged)
|
2022-02-20 10:09:49 -05:00 |
|
Eduardo Quezada D'Ottone
|
9a88021448
|
Remove repeated ability check in battle_ai_util.c
|
2022-02-17 21:39:15 -03:00 |
|
GriffinR
|
8c64ba335c
|
Merge pull request #1630 from GriffinRichards/party-menu-slots
Convert party menu slots to bin files
|
2022-02-16 13:00:13 -05:00 |
|
GriffinR
|
3b75cd13d0
|
Merge pull request #1631 from GriffinRichards/missing-colors
Add some missing RGB constant usage
|
2022-02-16 09:24:16 -05:00 |
|
GriffinR
|
0710a5467b
|
Add some missing RGB constant usage
|
2022-02-15 21:55:51 -05:00 |
|
GriffinR
|
131ed1916e
|
Generalize name of party slot without HP
|
2022-02-15 16:24:19 -05:00 |
|
GriffinR
|
49eca60955
|
Convert party menu slots to bin files
|
2022-02-15 16:12:54 -05:00 |
|
GriffinR
|
7ddb9cb84c
|
Add missing direction constant usage
|
2022-02-14 17:34:01 -05:00 |
|
BuffelSaft
|
6a119c5a30
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
|
2022-02-13 21:06:15 +13:00 |
|
Eduardo Quezada D'Ottone
|
5e9767e067
|
Fixed actually checking for Sheer Cold instead of affecting all OHKO moves
|
2022-02-13 01:13:44 -03:00 |
|
Eduardo Quezada D'Ottone
|
dde65d5cea
|
Config for Sheer Cold being less accurate when not used by Ice type Pokémon
|
2022-02-13 01:07:42 -03:00 |
|
Eduardo Quezada D'Ottone
|
748ce99de3
|
Config for Ingrain grounding the user
|
2022-02-13 00:17:37 -03:00 |
|
Eduardo Quezada D'Ottone
|
76e0b38960
|
Config for Pokémon with Oblivious being affected by Taunt
|
2022-02-12 23:57:23 -03:00 |
|
Eduardo Quezada D'Ottone
|
389a38b3cd
|
Config for Facade being affected by burns
|
2022-02-12 23:55:54 -03:00 |
|
Eduardo Quezada D'Ottone
|
0dd2de988a
|
Merge branch 'battle_engine' into primalReversionTweaks
|
2022-02-12 23:08:12 -03:00 |
|
LOuroboros
|
b52233ec31
|
Updated Conversion's effect
|
2022-02-11 21:42:39 -03:00 |
|
Eduardo Quezada D'Ottone
|
1454384b1b
|
Merge pull request #2052 from ghoulslash/be/ai_whostrikesfirst
Fix AI_WhoStrikesFirst
|
2022-02-11 17:56:53 -03:00 |
|
ghoulslash
|
2782e816a4
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be/psychoshift
|
2022-02-09 14:31:46 -05:00 |
|
ghoulslash
|
209279c207
|
fix psycho shift string printing
|
2022-02-09 14:30:30 -05:00 |
|
ghoulslash
|
fcc85e8c17
|
fix AI_WhoStrikesFirst
|
2022-02-09 11:23:30 -05:00 |
|
kiliwily
|
a86a279184
|
Update money.c
|
2022-02-06 16:25:56 +01:00 |
|
ghoulslash
|
36a824d8ab
|
fix ability pop up for quick draw
|
2022-02-03 17:30:32 -05:00 |
|
GriffinR
|
7d2344c07b
|
Merge pull request #1616 from GriffinRichards/missing-req
Add missing :req, remove old macros
|
2022-02-02 22:09:36 -05:00 |
|
Eduardo Quezada D'Ottone
|
5dc6f1caa4
|
Merge pull request #2047 from SubzeroEclipse/BE_decaps
Decapitalization of some battle strings
|
2022-02-01 14:57:52 -03:00 |
|
SubzeroEclipse
|
b946775e50
|
Fixed some new battle strings
|
2022-02-01 13:19:07 +01:00 |
|
GriffinR
|
1ff0b0efa9
|
Add missing collision constant usage
|
2022-01-29 21:13:46 -05:00 |
|
LOuroboros
|
ef3db02c22
|
Updated GetBallThrowableState
|
2022-01-29 12:30:40 -03:00 |
|
SubzeroEclipse
|
5f33989c42
|
Fixed format of move descriptions' labels
|
2022-01-27 21:50:12 +01:00 |
|
BuffelSaft
|
9d1800f53e
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
|
2022-01-27 17:18:51 +13:00 |
|
GriffinR
|
e30b16f0fd
|
Fix Swap_HandleQuitSwappingResposne typo
|
2022-01-26 21:50:15 -05:00 |
|
LOuroboros
|
88b7326325
|
Ported the IE's flingPower item field and ItemId_GetFlingPower
|
2022-01-26 21:48:01 -03:00 |
|
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 |
|
LOuroboros
|
6470b0d004
|
Used ball constants in gBallSpriteTemplates
|
2022-01-26 18:36:21 -03:00 |
|
LOuroboros
|
b33f7aed8d
|
Oopsie
|
2022-01-25 23:31:23 -03:00 |
|
LOuroboros
|
7916ff5f47
|
Further updated CanFling
|
2022-01-25 21:02:26 -03: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 |
|
ghoulslash
|
a165f9926d
|
canbestatused for psycho shift
|
2022-01-23 13:46:30 -05:00 |
|
ghoulslash
|
3e1ddf6b93
|
Merge pull request #2042 from AsparagusEduardo/BE_unnerveChecks
Removed redundant checks for Unnerve
|
2022-01-23 13:22:52 -05: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 |
|
Kurausukun
|
317e302147
|
fix inconsistent indentation
|
2022-01-22 19:43:11 -05:00 |
|
Kurausukun
|
a83e41b2cc
|
move m4a track definitions
|
2022-01-22 19:37:46 -05:00 |
|
Eduardo Quezada D'Ottone
|
60f46a710c
|
Removed redundant checks for Unnerve
|
2022-01-22 21:04:59 -03:00 |
|
Eduardo Quezada D'Ottone
|
b7df21b263
|
Optimized use of GetBattlerAbility
|
2022-01-22 20:25:51 -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 |
|
Eduardo Quezada D'Ottone
|
f42c4cd689
|
Merge pull request #1734 from ghoulslash/magician
Magician
|
2022-01-21 16:03:15 -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
|
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
|
e3b49604d4
|
Use metatile layer constants in shop
|
2022-01-19 10:59:37 -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
|
30d9704418
|
Specify unsigned in spot comment
|
2022-01-17 17:27:17 -05:00 |
|
GriffinR
|
313f14ed63
|
Add Spinda spot color constants
|
2022-01-17 17:00:18 -05:00 |
|
GriffinR
|
177863da47
|
Fix typo
|
2022-01-17 16:04:02 -05:00 |
|
GriffinR
|
225147a94f
|
Document Spinda spot algorithm
|
2022-01-17 15:34:18 -05: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 |
|
Eduardo Quezada D'Ottone
|
ddfc3502f7
|
Fixed Pokémon Expansion flag name
|
2022-01-16 17:21:05 -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 |
|
GriffinR
|
dad4132762
|
Merge pull request #1596 from GriffinRichards/player-avatar-arr-const
Add missing array constants in field_player_avatar
|
2022-01-16 14:03:20 -05:00 |
|
ghoulslash
|
7182f290c1
|
fix harvest activation msg
|
2022-01-16 12:39:08 -05:00 |
|
ghoulslash
|
f3b9e6bb63
|
Merge pull request #1976 from kleeenexfeu/patch-2
[battle_engine] Moxie interaction with spread move/follow me fix
|
2022-01-16 10:58:50 -05:00 |
|
GriffinR
|
755d9143a6
|
Merge pull request #1600 from GriffinRichards/remove-berry-fix
Remove berry fix
|
2022-01-15 12:20:22 -05:00 |
|
Eduardo Quezada D'Ottone
|
6aabe58649
|
Merge branch 'battle_engine' into magician
|
2022-01-15 13:06:13 -03:00 |
|
GriffinR
|
bd43b905b7
|
Apply palettes to some field effect pngs
|
2022-01-14 12:51:13 -05:00 |
|
GriffinR
|
4dec9b83a3
|
Move more graphics out of misc
|
2022-01-14 12:29:30 -05:00 |
|
Eduardo Quezada D'Ottone
|
80c1e11245
|
Merge branch 'BattleEngine' into BE_Instruct
# Conflicts:
# src/battle_script_commands.c
|
2022-01-13 20:13:01 -03:00 |
|
GriffinR
|
fd7457b05a
|
Remove berry fix
|
2022-01-13 15:26:20 -05:00 |
|
ghoulslash
|
2b69b02724
|
Merge pull request #2017 from AsparagusEduardo/BE_forbiddenAssist
Extrapolated Assist forbidden flags to Gen 8 moves
|
2022-01-13 11:52:11 -05:00 |
|
ghoulslash
|
cbb4bca49a
|
Merge pull request #2028 from AsparagusEduardo/BE_AnchorShot
Fixed Anchor Shot description.
|
2022-01-13 11:43:39 -05: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 |
|
ghoulslash
|
078874aa1e
|
move some WEATHER_HAS_EFFECT after bitfield checks to speed up damage calcs
|
2022-01-13 11:32:22 -05:00 |
|
ghoulslash
|
035b2332af
|
cache ai damage, effectiveness calcs
|
2022-01-13 11:28:27 -05:00 |
|
LOuroboros
|
a4f0de5106
|
Removed the last bits of HOLD_EFFECT_GRACIDEA
|
2022-01-12 01:54:29 -03:00 |
|
LOuroboros
|
bee4019d22
|
Tweaked Protean's effect's InGame appearance
|
2022-01-11 19:52:51 -03:00 |
|
GriffinR
|
01af8e877f
|
Move starter choose out of interface/misc
|
2022-01-11 17:49:08 -05:00 |
|
GriffinR
|
694aa3c65d
|
Move balls, shop, link, map popups, and bag out of interface
|
2022-01-11 13:53:23 -05:00 |
|
GriffinR
|
fa2d25d366
|
Merge pull request #1594 from GriffinRichards/pokestorage-clean
Misc pokemon_storage_system cleanup
|
2022-01-11 12:26:02 -05:00 |
|
GriffinR
|
d782d3544d
|
Move pokeblock graphics out of interface
|
2022-01-11 11:46:58 -05:00 |
|
GriffinR
|
565dd24309
|
Move party menu graphics out of interface
|
2022-01-11 11:37:13 -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 |
|
LOuroboros
|
352523403a
|
Fixed usage of B_MULTI_BATTLE_WHITEOUT
|
2022-01-09 14:57:45 -03:00 |
|
GriffinR
|
429d53b95c
|
Use runningState directly in CheckMovementInputNotOnBike
|
2022-01-09 11:12:35 -05:00 |
|
GriffinR
|
8b920691e6
|
Fix FLAG_DECORATION_0 name
|
2022-01-09 01:31:42 -05:00 |
|
GriffinR
|
8f1a760937
|
Add missing array constants in field_player_avatar
|
2022-01-08 23:55:26 -05:00 |
|
Eduardo Quezada D'Ottone
|
f6b32c8d17
|
Fixed Anchor Shot description.
|
2022-01-08 20:19:53 -03:00 |
|
sphericalice
|
6a21c3f5f3
|
Remove unneeded brackets in GetWeekCount
|
2022-01-08 20:39:45 +00:00 |
|
Eduardo Quezada D'Ottone
|
eba4c36189
|
Merge pull request #2024 from TheXaman/rhh_BE_B_SLEEP_TURNS
Yawn now uses B_SLEEP_TURNS
|
2022-01-07 21:56:06 -03:00 |
|
GriffinR
|
ca9bc34bea
|
Clean up pokemon_storage_system graphics
|
2022-01-07 17:36:38 -05:00 |
|
GriffinR
|
5cbe572607
|
Add window constants in pokemon_storage_system
|
2022-01-07 17:05:58 -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
|
713cd6616e
|
Add glow tile empty
|
2022-01-06 22:33:00 -05:00 |
|
kiliwily
|
8a9740b819
|
Update field_specials.c
|
2022-01-06 19:47:56 +01:00 |
|
kiliwily
|
ba9b533845
|
Revert "Update field_specials.c"
This reverts commit f67137ddb2.
|
2022-01-06 19:45:38 +01:00 |
|
kiliwily
|
f67137ddb2
|
Update field_specials.c
|
2022-01-06 19:29:58 +01:00 |
|
GriffinR
|
d4111d5520
|
Add comment about pokedex reordering
|
2022-01-05 14:50:19 -05:00 |
|
TheXaman
|
328b501394
|
Update src/battle_util.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-01-05 18:54:42 +01:00 |
|
TheXaman
|
9733f92c7f
|
Yawn now uses B_SLEEP_TURNS, resolves #1873
|
2022-01-05 18:48:01 +01:00 |
|
GriffinR
|
5d033c2e4d
|
Convert pokedex defines to enums
|
2022-01-05 12:18:49 -05:00 |
|
W1serV1ser
|
178c4c66ba
|
Fixed gSideTimers typo
|
2022-01-04 12:38:50 -08:00 |
|
W1serV1ser
|
66faa6aa15
|
Follow Me/Rage Powder effect on target goes away once affected by Sky Drop
|
2022-01-04 12:33:31 -08:00 |
|
GriffinR
|
ce55e58ad8
|
Misc cleanup
|
2022-01-04 10:09:42 -05:00 |
|
sphericalice
|
48bf1ab98d
|
Use SPECIES_NONE and ITEM_NONE in battle_tower.c
|
2022-01-04 13:46:46 +00:00 |
|
sphericalice
|
2d536bf560
|
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu
|
2022-01-02 21:02:53 +00:00 |
|
Eduardo Quezada D'Ottone
|
d433d67558
|
Extrapolated Assist forbidden flags to Gen 8 moves
|
2022-01-01 20:21:29 -03: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 |
|
sphericalice
|
61a0036c47
|
Clarify ScrollableMultichoice_ProcessInput comment
|
2021-12-31 17:34:46 +00:00 |
|
sphericalice
|
9e660b2cdf
|
Update src/field_specials.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2021-12-31 16:29:11 +00:00 |
|
sphericalice
|
4f6323606f
|
Update field_specials.c to match the style
|
2021-12-31 16:24:44 +00:00 |
|
GriffinR
|
23f5c9fd5c
|
Clean up pokedex_area_screen
|
2021-12-31 00:16:56 -05:00 |
|
sphericalice
|
50522fdea4
|
Remove some magic numbers from TryPushBoulder
|
2021-12-30 12:21:47 +00:00 |
|
LOuroboros
|
34c6e6ca31
|
Update battle_ai_util.c
|
2021-12-30 01:48:56 -03:00 |
|
Eduardo Quezada D'Ottone
|
5b54986e6b
|
Merge pull request #1980 from LOuroboros/multiBattles
Multi battle updates
|
2021-12-29 22:09:06 -03:00 |
|
Eduardo Quezada D'Ottone
|
ba43280a7c
|
Refactored Instruct to use the regular forbidden move lookup table
|
2021-12-29 21:04:15 -03:00 |
|