ExpoSeed
208e0abe04
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2020-12-31 18:44:43 -06:00
GriffinR
769ddf22c2
Label remaining subs in battle_tower.c
2020-12-24 16:18:47 -05:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush
...
fakematch fixes, begin documenting Berry Crush (based on #1187 )
2020-12-14 23:22:41 -05:00
GriffinR
c611421882
Merge pull request #1267 from ipatix/m4a_names
...
refactor m4a.c/m4a_1.s constant/variable/type naming
2020-12-14 20:03:53 -05:00
GriffinR
18a5feb413
Merge pull request #1269 from GriffinRichards/bugfix
...
Use BUGFIX for some inline fixes
2020-12-14 20:00:59 -05:00
GriffinR
f7a729df30
BUGFIX implies UBFIX
2020-12-13 16:16:48 -05:00
Tim Gates
581306db7b
docs: fix simple typo, redunant -> redundant
...
There is a small typo in include/constants/battle_frontier.h.
Should read `redundant` rather than `redunant`.
2020-12-13 22:14:50 +11:00
GriffinR
81d95b9325
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
LOuroboros
55bc2b4bb9
Corrected small inconsistency in move flag names
2020-12-12 12:18:56 -03:00
Michael Panzlaff
91ccf9e343
fix typo
2020-12-12 13:07:56 +01:00
Michael Panzlaff
f177c736fc
more CgbSound decipher work
2020-12-11 16:33:58 +01:00
Michael Panzlaff
15ff55eee5
use better m4a variable/constant names
2020-12-11 16:33:55 +01:00
Kurausukun
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
GriffinR
f95192ed87
Define terminal species IDs relatively
2020-12-08 00:45:05 -05:00
GriffinR
9d056e8656
Move object event pal declarations to graphics
2020-11-23 14:45:16 -05:00
GriffinR
513c7c5f45
Clarify Kecleon objects
2020-11-23 14:42:47 -05:00
GriffinR
bf65c1fb25
Name object event pals/tags
2020-11-23 14:24:48 -05:00
kageru
6f91f7e0e3
Use more constants in Battle Tower code
2020-11-17 17:40:26 +01:00
Eduardo Quezada D'Ottone
6f29abbe0e
Plate type data and hold effect #1207 from ExpoSeed
2020-11-09 15:24:13 -03:00
Eduardo Quezada D'Ottone
b19ee3c554
Capitalization.
2020-11-09 14:53:10 -03:00
Eduardo Quezada D'Ottone
102e686a94
Updated comment.
2020-11-09 14:48:47 -03:00
Eduardo Quezada D'Ottone
bacabf03a8
Review changes.
2020-11-09 13:45:08 -03:00
Eduardo Quezada D'Ottone
b4cf674fa1
Moved ITEM_EXPANSION define to global.h to fix reading from other branches like Battle Engine
2020-11-09 12:38:53 -03:00
Eduardo Quezada D'Ottone
2e01654eb9
Plate type data and hold effect.
2020-11-08 01:47:05 -06:00
Eduardo Quezada D'Ottone
8d86169283
Merge remote-tracking branch 'pret/master' into IE-pretSync
2020-11-07 14:54:52 -03:00
MCboy
e31158d017
add spaces around - and remove comment from include in battle.h
2020-11-06 23:29:52 +03:30
MCboy
3b91735e63
use constants for ball throw count
2020-11-06 22:59:46 +03:30
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts
...
Undo PokeCodec's PRs and port changes
2020-11-03 09:28:45 -05:00
Kurausukun
6545745e59
Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts
2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227
address comments
2020-11-02 18:43:11 -05:00
ExpoSeed
c2e8f51e35
Merge pull request #145 from AsparagusEduardo/IE-Config
...
Item Expansion config file.
2020-11-02 11:31:51 -06:00
GriffinR
be1685c87f
Use constants for menu info icon table
2020-10-29 16:34:33 -04:00
aaaaaa123456789
1c3d75f673
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466
re-match BattleIntroOpponent1SendsOutMonAnimation
...
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
2020-10-26 05:52:00 -04:00
Kurausukun
83846b913a
port sub_806F160 fakematch fix
2020-10-26 00:01:53 -04:00
Eduardo Quezada
4aa6442cd4
Fixed price mixed up.
2020-10-25 01:28:14 -03:00
LOuroboros
61b41f3599
Removed unused labels for expanded TMs
2020-10-24 09:57:11 -03:00
Kurausukun
44c2d15ca9
re-match sub_81C79BC (from #1177 )
...
also re-define RBG macros
2020-10-23 22:07:30 -04:00
Eduardo Quezada
e861abeff3
Initial review changes.
2020-10-23 22:19:37 -03:00
Kurausukun
90211248af
re-match Cmd_unknown_24 (from #1140 )
...
changes to data structs are necessary. other things that look
unnecessary, like the order of operands, are also necessary. fuck this
function.
2020-10-23 20:47:10 -04:00
Evan
d64b926469
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion
2020-10-19 11:22:41 -06:00
Eduardo Quezada
12bc93dc78
Review changes
2020-10-17 17:07:54 -03:00
Eduardo Quezada
ffe23b246b
Ordered config.
2020-10-17 02:54:13 -03:00
Eduardo Quezada
0717783651
Dream ball config.
2020-10-17 02:51:08 -03:00
Eduardo Quezada
e320e6f7ff
Quick Ball config.
2020-10-17 02:44:09 -03:00
Eduardo Quezada
6f246bb0c7
Dusk Ball config
2020-10-17 02:41:02 -03:00
Eduardo Quezada
ce3b877666
Dive Ball config.
2020-10-17 02:33:15 -03:00
Eduardo Quezada
14c243b273
Timer ball config.
2020-10-17 02:08:58 -03:00
Eduardo Quezada
32a2f91ecb
Repeat Ball modifier in config.
2020-10-17 02:04:39 -03:00
Eduardo Quezada
6af4425081
Nest Ball modifier in config.
2020-10-17 02:00:53 -03:00
