Commit Graph

9400 Commits

Author SHA1 Message Date
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
GriffinR
49eca60955 Convert party menu slots to bin files 2022-02-15 16:12:54 -05:00
GriffinR
2fcd57eab2
Merge pull request #1629 from GriffinRichards/connection-dir
Add missing direction constant usage
2022-02-14 23:50:06 -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
eebe664bfc
Merge pull request #2054 from LOuroboros/conversion
Updated Conversion's effect
2022-02-12 22:08:00 -03:00
LOuroboros
92d8268603
Update include/constants/battle_config.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-02-12 00:18:24 -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
Eduardo Quezada D'Ottone
5c552cd070
Merge pull request #2043 from ghoulslash/be/psychoshift
Psycho Shift uses CanBeStatused Functions
2022-02-11 17:55:11 -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
GriffinR
eb07617a20
Merge pull request #1623 from kiliwily/master
Update money.c
2022-02-09 08:34:10 -05:00
kiliwily
a86a279184 Update money.c 2022-02-06 16:25:56 +01:00
Eduardo Quezada D'Ottone
69d62f1cb9
Merge pull request #2049 from ghoulslash/be/quickdraw
Fix ability pop up for quick draw
2022-02-03 21:07:34 -03: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
f494238a9d
Merge pull request #1621 from GriffinRichards/constants-collision
Add missing collision constant usage
2022-01-30 23:00:05 -05:00
GriffinR
1ff0b0efa9 Add missing collision constant usage 2022-01-29 21:13:46 -05:00
ghoulslash
0046283c04
Merge pull request #2045 from LOuroboros/patch-2
Updated GetBallThrowableState
2022-01-29 11:55:04 -05:00
LOuroboros
ef3db02c22
Updated GetBallThrowableState 2022-01-29 12:30:40 -03:00
Eduardo Quezada D'Ottone
3b4f219180
Merge pull request #2044 from SubzeroEclipse/BE_MoveDescriptions
Fixed format of move descriptions' labels
2022-01-28 18:24:51 -03:00
SubzeroEclipse
5f33989c42 Fixed format of move descriptions' labels 2022-01-27 21:50:12 +01:00