Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

13536 Commits

Author SHA1 Message Date
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
LOuroboros
52e3cf4f59 Added missing flingPower values 2022-01-22 05:40:29 -03:00
LOuroboros
367ba2d5bf Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into flingIE 2022-01-22 05:39:48 -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
02da6cc627 Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb 
# Conflicts:
#	include/graphics.h
#	src/data/graphics/items.h
#	src/data/item_icon_table.h
#	src/data/items.h
#	src/data/text/item_descriptions.h
 2022-01-16 18:44:03 -03: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
Eduardo Quezada D'Ottone
b86694876c
Merge pull request #1508 from Scott-Bonner/get_ability 
Handle GetAbilityBySpecies edge cases
 2022-01-15 12:56:50 -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
LOuroboros
c8a2379687
Fixed InitUnionRoomChat 2022-01-13 19:17:21 -03:00
GriffinR
fd7457b05a Remove berry fix 2022-01-13 15:26:20 -05:00