ghoulslash
|
02fe96cc08
|
fix config settings
|
2021-12-20 13:06:23 -05:00 |
|
LOuroboros
|
cb44de13b3
|
B_NEW_MULTI_BATTLE_DEFEAT_CONDITION -> B_MULTI_BATTLE_WHITEOUT
|
2021-12-19 20:53:57 -03:00 |
|
Eduardo Quezada D'Ottone
|
4ab4250d5d
|
Merge branch 'battle_engine' into be/sports
|
2021-12-19 20:42:15 -03:00 |
|
Eduardo Quezada D'Ottone
|
b21dc1e562
|
Merge pull request #2003 from LOuroboros/patch-2
Fixed a typo in the items' data
|
2021-12-19 20:37:40 -03:00 |
|
LOuroboros
|
211c8c684d
|
Update items.h
|
2021-12-19 20:30:03 -03:00 |
|
Eduardo Quezada D'Ottone
|
a57043b589
|
Merge pull request #1983 from sphericalice/last_ball_refactor
Refactor CanThrowLastUsedBall and related functions
|
2021-12-19 20:21:50 -03:00 |
|
Eduardo Quezada D'Ottone
|
6d17156f74
|
Merge pull request #1934 from BuffelSaft/fix-burmy
Fix Burmy form change
|
2021-12-19 20:18:19 -03:00 |
|
Eduardo Quezada D'Ottone
|
7e3282fba5
|
Merge pull request #1972 from LOuroboros/spaces
Removed weird spaces in 7 dex descriptions
|
2021-12-19 20:14:05 -03:00 |
|
Eduardo Quezada D'Ottone
|
793de70068
|
Fixed reference to PlayCry2
|
2021-12-19 13:09:01 -03:00 |
|
Eduardo Quezada D'Ottone
|
8b49f8f925
|
Merge branch 'pokemon_expansion' into PE_FormChangeHoldItems
|
2021-12-19 12:08:52 -03:00 |
|
LOuroboros
|
ffe35fbb06
|
Updated defeat condition on multi battles
|
2021-12-19 08:30:43 -03:00 |
|
Blackforest92
|
76b9459e42
|
fix .8bpp palette + revert hippo icons
|
2021-12-19 17:38:01 +07:00 |
|
LOuroboros
|
a21d2ca98f
|
Fixed syntax in footprint_table.h
|
2021-12-18 18:35:18 -03:00 |
|
LOuroboros
|
614c0ee8d7
|
Added Gen. 8 footprint sprites
|
2021-12-18 18:24:49 -03:00 |
|
LOuroboros
|
834ab37b2c
|
Added Gen. 7 footprint sprites
|
2021-12-18 17:48:45 -03:00 |
|
Eduardo Quezada D'Ottone
|
4ca9f406f6
|
Merge pull request #1947 from LOuroboros/lightBall
Updated Light Ball's effect and improved readability
|
2021-12-18 15:03:18 -03:00 |
|
Eduardo Quezada D'Ottone
|
66e6b140ac
|
Merge pull request #1987 from rh-hideout/DizzyEggg-patch-1
Fix Intimidate affecting fainted mons
|
2021-12-18 15:01:19 -03:00 |
|
Eduardo Quezada D'Ottone
|
3a24bc8298
|
Merge branch 'battle_engine' into DizzyEggg-patch-1
|
2021-12-18 14:52:19 -03:00 |
|
Eduardo Quezada D'Ottone
|
1772997082
|
Merge pull request #1994 from AsparagusEduardo/BE_HPDrain
Config for HP bars moving faster for higher HP amounts. Credit to Dat.H
|
2021-12-18 13:50:05 -03:00 |
|
Eduardo Quezada D'Ottone
|
39ef356be1
|
Merge pull request #1935 from LOuroboros/someGenderDiffs
Added gender differences for a couple of Gen. 4 Pokémon
|
2021-12-18 13:46:23 -03:00 |
|
Eduardo Quezada D'Ottone
|
a075cca448
|
Merge branch 'battle_engine' into fix-burmy
|
2021-12-18 13:38:12 -03:00 |
|
Eduardo Quezada D'Ottone
|
c3939cd32b
|
Merge pull request #1978 from LOuroboros/pikaPal
Fixed the palette of Pikachu Partner Cap's back
|
2021-12-18 13:28:23 -03:00 |
|
Eduardo Quezada D'Ottone
|
9adbf3350e
|
Merge pull request #1965 from TheXaman/pokemon_expansion_debug
Pokemon expansion debug
|
2021-12-18 13:08:37 -03:00 |
|
Eduardo Quezada D'Ottone
|
bc43b5c650
|
Merge pull request #2000 from ultima-soul/master_sync
Master Upstream Sync
|
2021-12-18 11:00:50 -03:00 |
|
Eduardo Quezada D'Ottone
|
bd75ee9688
|
Using TAG_NONE in battle debug
|
2021-12-18 10:55:04 -03:00 |
|
ultima-soul
|
18afd06f6d
|
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-12-18 00:28:18 -08:00 |
|
ultima-soul
|
b0b8b9bf46
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-12-17 23:51:29 -08:00 |
|
ultima-soul
|
4f2e3bf214
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-12-17 21:23:54 -08:00 |
|
Kurausukun
|
39f493287f
|
one more lel
|
2021-12-17 23:03:09 -05:00 |
|
Kurausukun
|
f336acb3a9
|
fix indentation again
|
2021-12-17 23:00:03 -05:00 |
|
Kurausukun
|
efee1288a0
|
fix indentation
|
2021-12-17 22:56:20 -05:00 |
|
Kurausukun
|
0f6311b470
|
accept 16-bit aiff files and convert to 8-bit
|
2021-12-17 22:49:45 -05:00 |
|
GriffinR
|
32a9ac6eb1
|
Merge pull request #1575 from LOuroboros/benriBotan
[LEAK INFORMED] Documented the unk19 item field
|
2021-12-17 22:27:45 -05:00 |
|
LOuroboros
|
4a74d288d4
|
Review corrections
|
2021-12-18 00:01:50 -03:00 |
|
LOuroboros
|
dbca24aa82
|
[LEAK INFORMED] Documented the unk19 item field
|
2021-12-17 19:41:39 -03:00 |
|
ultima-soul
|
84ce9745d5
|
Merge pull request #1990 from AsparagusEduardo/BE_debugArrows
Improved battle debug number value changing
|
2021-12-17 09:21:04 -08:00 |
|
ghoulslash
|
31bbc4ddde
|
prevent stat-raising damage effects if battle will end
|
2021-12-17 10:24:07 -05:00 |
|
Eduardo Quezada D'Ottone
|
837641f304
|
Update src/battle_debug.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-12-17 06:47:46 -03:00 |
|
Eduardo Quezada D'Ottone
|
8005db5040
|
Update src/battle_debug.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-12-17 06:47:35 -03:00 |
|
Eduardo Quezada D'Ottone
|
3a12cdb8cb
|
Update src/battle_debug.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-12-17 06:47:02 -03:00 |
|
ExpoSeed
|
65186b8c3a
|
Fix some style issues
|
2021-12-16 21:57:30 -06:00 |
|
ExpoSeed
|
d6747527da
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
|
2021-12-16 21:44:01 -06:00 |
|
ultima-soul
|
961710ddd9
|
Merge pull request #1986 from AsparagusEduardo/BE_steamEngine
Added Steam Engine's overworld effect
|
2021-12-16 16:15:58 -08:00 |
|
ultima-soul
|
5788caef39
|
Merge pull request #1996 from ghoulslash/pe/evo_weather
fix EVO_LEVEL_RAIN
|
2021-12-16 16:14:08 -08:00 |
|
Eduardo Quezada D'Ottone
|
8422ad6ccd
|
Merge pull request #1997 from ultima-soul/ie/enigma_berry_2
Add Back Enigma Berry e-Reader Constant With Less Conflicts and Update Berry Data
|
2021-12-16 21:07:21 -03:00 |
|
Eduardo Quezada D'Ottone
|
d23e7069bd
|
Merge pull request #1998 from ultima-soul/be/enigma_berry_3
Eliminate Item Expansion Conflicts for ITEM_ENIGMA_BERRY_E_READER Constant
|
2021-12-16 21:07:15 -03:00 |
|
ultima-soul
|
f0ffc749e9
|
Fix formatting for EVO_LEVEL_RAIN checks.
|
2021-12-16 16:05:51 -08:00 |
|
ultima-soul
|
356cf96654
|
Match berry data to new berry order, correct Gen 4+ berry data, and add back Enigma Berry e-Reader data entries.
|
2021-12-15 19:33:35 -08:00 |
|
GriffinR
|
6e5520207f
|
Merge pull request #1573 from GriffinRichards/tilesetanim
Clean up tileset_anims
|
2021-12-15 09:47:54 -05:00 |
|
GriffinR
|
961dbee5e3
|
Clean up tileset_anims
|
2021-12-14 21:41:07 -05:00 |
|