Commit Graph

9577 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
c4dea447ee
Merge pull request #2080 from LOuroboros/patch-3
Update battle_scripts_1.s
2022-03-20 19:22:50 -03:00
LOuroboros
387bf07e3c
Update battle_scripts_1.s 2022-03-20 19:00:21 -03:00
Eduardo Quezada D'Ottone
c4e5d93dc5
Merge pull request #2078 from LOuroboros/patch-3
BattleScript_EffectFlinchWithStatus -> BattleScript_EffectFlinchStatus
2022-03-20 18:57:35 -03:00
Eduardo Quezada D'Ottone
f371288bc2
Merge pull request #2079 from LOuroboros/patch-4
Fix Enigma Berry check in CanMegaEvolve
2022-03-20 18:57:09 -03:00
LOuroboros
0a65fd316c Fixed Enigma Berry check in CanMegaEvolve 2022-03-20 12:21:15 -03:00
Andrea Jemmett
f8b3a1c658 Fix finding libpng in gbagfx and rsfont
On macOS 12, Homebrew installs libpng in a custom location.
2022-03-16 14:41:12 +01:00
GriffinR
5160520639
Merge pull request #1642 from GriffinRichards/bstrings
Add usage of battle strings table offset constant
2022-03-14 16:40:54 -04:00
GriffinR
33c05cefe2
Merge pull request #1644 from GriffinRichards/name-jump-long-grass
Name unknown_16.png
2022-03-14 16:32:08 -04:00
GriffinR
058783c148 Fix comment mistake 2022-03-14 16:01:17 -04:00
GriffinR
0a0157b62c Name unknown_16.png 2022-03-14 15:54:47 -04:00
LOuroboros
aca51e843e
Update battle_scripts_1.s 2022-03-14 16:14:32 -03:00
Eduardo Quezada D'Ottone
c00873cbc4
Merge pull request #2073 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
2022-03-13 18:15:45 -03:00
GriffinR
ce227aa055
Merge pull request #1640 from GriffinRichards/doc-egg-hatch
Improve egg hatch documentation
2022-03-12 09:41:14 -05:00
GriffinR
bb91b1b0d1 Update generic macro argument names 2022-03-10 16:36:41 -05:00
GriffinR
d664135572 Add usage of battle strings table offset constant 2022-03-10 10:44:04 -05:00
ghoulslash
daf5095c27
Merge pull request #2077 from SubzeroEclipse/BE_DescriptionFixes
Fixed some move descriptions
2022-03-09 21:30:49 -05:00
SubzeroEclipse
d3589103b3 Fixed some move descriptions 2022-03-09 15:23:08 +01:00
Eduardo Quezada D'Ottone
20da792f90
Merge pull request #2076 from ghoulslash/be/orbfix
fix toxic/flame orb. use CanBeX'ed functions
2022-03-08 17:25:01 -03: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
Eduardo Quezada D'Ottone
ab5630813c
Merge pull request #2067 from ghoulslash/be/glare
move glare effectiveness exception to code
2022-02-25 12:47:14 -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
GriffinR
6262080e9c
Merge pull request #1614 from laqieer/patch-1
Install libpng using pacman instead of manual build for msys2
2022-02-23 08:07:23 -05:00
GriffinR
f7ba502c52
Merge pull request #1637 from cbt6/pc-location
Use constants for PC locations
2022-02-23 08:04:16 -05:00
cbt6
f826a5a82d Use constants for PC locations 2022-02-23 15:07:22 +08:00
GriffinR
3765c1e7f1
Merge pull request #1635 from sphericalice/battle-pyramind
Rename GetBattlePyramindTrainerEncounterMusicId to fix typo
2022-02-22 14:22:35 -05: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