Blackforest92
|
2b512a8e03
|
Fix Voltorb and Exeggutor' form species table
|
2022-08-19 18:14:11 +07:00 |
|
Blackforest92
|
346f3b7f4c
|
Fix PLA's base_stats.h (rename .item2 to .itemRare)
|
2022-08-19 18:01:28 +07:00 |
|
Blackforest92
|
a9d09bcd17
|
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion
|
2022-08-19 17:53:01 +07:00 |
|
Blackforest92
|
00a827b3fb
|
Add PLA pokemon to Form Species Table, add Kleavor's graphics
|
2022-08-19 17:47:34 +07:00 |
|
Eduardo Quezada D'Ottone
|
e3d042bee9
|
Merge pull request #2214 from LOuroboros/patch-1
Sync this branch's include/constants/moves.h with the BE's
|
2022-07-28 11:05:57 -04:00 |
|
LOuroboros
|
b9c83710c4
|
Sync this branch's include/constants/moves.h with the BE's
|
2022-07-28 11:12:28 -03:00 |
|
ghoulslash
|
1260666c91
|
Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides
Added Egg breeding species overrides.
|
2022-07-22 14:05:14 -04:00 |
|
ghoulslash
|
0588bba193
|
Merge pull request #2195 from AsparagusEduardo/PE_pretmerge
Pokémon Expansion pret merge
|
2022-07-22 14:01:27 -04:00 |
|
Eduardo Quezada D'Ottone
|
e40fe3308c
|
Merge pull request #2191 from sphericalice/patch-1
Give Pikachu its typing back
|
2022-07-18 07:52:49 -04:00 |
|
sphericalice
|
65db9238e8
|
Give Pikachu its typing back
|
2022-07-18 09:41:04 +01:00 |
|
Eduardo Quezada D'Ottone
|
c69275f373
|
Merge remote-tracking branch 'pret/master' into PE_pretmerge
# Conflicts:
# include/battle_anim.h
# include/pokemon.h
# src/data/pokemon/base_stats.h
|
2022-07-12 17:20:49 -04:00 |
|
GriffinR
|
30a5821997
|
Merge pull request #1705 from sphericalice/move-unavailable
Introduces a MOVE_UNAVAILABLE constant
|
2022-07-12 11:32:57 -04:00 |
|
GriffinR
|
a359db6a8c
|
Merge pull request #1704 from LOuroboros/typeAbNameLength
Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH
|
2022-07-11 22:49:29 -04:00 |
|
sphericalice
|
167353223c
|
Use MAX_MON_MOVES in Cmd_trysetencore
|
2022-07-11 15:23:23 +01:00 |
|
sphericalice
|
186f2c0232
|
Introduce a MOVE_UNAVAILABLE constant
|
2022-07-11 15:18:13 +01:00 |
|
LOuroboros
|
a1004485c5
|
Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH
|
2022-07-10 20:08:28 -03:00 |
|
GriffinR
|
15f386ede6
|
Move make compare to its own build section
|
2022-07-08 01:34:38 -04:00 |
|
GriffinR
|
76659a4091
|
Merge pull request #1700 from mrgriffin/battle-setup-water-transition
Simplify GetBattleTransitionTypeByMap
|
2022-07-05 11:10:16 -04:00 |
|
Martin Griffin
|
c9958e3087
|
Simplify GetBattleTransitionTypeByMap
|
2022-07-05 14:17:46 +01:00 |
|
GriffinR
|
8231ea2b68
|
Merge pull request #1699 from mrgriffin/field-camera-mod-16
Identify a % 16
|
2022-07-04 16:31:37 -04:00 |
|
Martin Griffin
|
4e76ffb4ca
|
Identify a % 16
|
2022-07-04 21:25:19 +01:00 |
|
Blackforest92
|
ff861ff963
|
Add some of Legends Arceus battle sprites
|
2022-07-04 12:28:40 +07:00 |
|
Blackforest92
|
8c88e8a9b7
|
Legends Arceus Pokemon 95% Finished
|
2022-07-03 17:15:37 +07:00 |
|
ghoulslash
|
ade935f6cf
|
Merge pull request #2167 from LOuroboros/ampedSyntax
Syntax fixes for Toxel's evo methods
|
2022-07-01 15:29:06 -04:00 |
|
LOuroboros
|
e2cc269b43
|
Updated syntax
|
2022-07-01 16:19:35 -03:00 |
|
ghoulslash
|
fc2cfd8c9d
|
Merge pull request #2136 from LOuroboros/pePretMerge
Pret merge for the pokemon_expansion
|
2022-07-01 09:22:55 -04:00 |
|
ghoulslash
|
6cb0434eff
|
Merge pull request #2152 from Sneed69/form_base_stats_macros
Condense base_stats.h and make mass editing Pokemon forms/variants easier
|
2022-07-01 09:10:49 -04:00 |
|
GriffinR
|
650f033c2b
|
Merge pull request #1695 from GriffinRichards/update-gfromh
Update some GF rom header names
|
2022-06-29 11:59:43 -04:00 |
|
GriffinR
|
06c9e0eb99
|
Merge pull request #1697 from Kurausukun/bpm
Use Floats and Round Correctly in Tempo Calculation
|
2022-06-28 00:27:44 -04:00 |
|
Kurausukun
|
2e7f50064c
|
use floats for tempo calculation
|
2022-06-28 00:11:59 -04:00 |
|
GriffinR
|
8950a41bfd
|
Update some GF rom header names
|
2022-06-21 18:31:09 -04:00 |
|
GriffinR
|
c2a08cc84d
|
Merge pull request #1689 from GriffinRichards/task-ub
Remove UBFIX related to task destruction
|
2022-06-21 16:33:17 -04:00 |
|
GriffinR
|
a5291cbc10
|
Merge pull request #1694 from sphericalice/patch-1
Fix missing COPYWIN_FULL constant use
|
2022-06-19 11:54:29 -04:00 |
|
sphericalice
|
5d7140fa83
|
Fix missing COPYWIN_FULL constant use
|
2022-06-19 13:33:47 +01:00 |
|
GriffinR
|
fa1ae45b39
|
Merge pull request #1692 from coltongit/script-fixes
Supplant PR #1579 (Fix the last of the *.inc inconsistencies)
|
2022-06-18 21:02:28 -04:00 |
|
Colton G. Rushton
|
3de23b332a
|
Supplant https://github.com/pret/pokeemerald/pull/1579
|
2022-06-18 21:51:05 -03:00 |
|
GriffinR
|
21ed288f50
|
Merge pull request #1687 from SimplyBLGDev/patch-1
Format newlines in surf.inc
|
2022-06-18 11:04:39 -04:00 |
|
GriffinR
|
a931874164
|
Merge pull request #1691 from coltongit/patch-5
Format newline in BattleFrontier_BattlePikeLobby/scripts.inc
|
2022-06-18 11:04:20 -04:00 |
|
Colton G. Rushton
|
c8e6d69fdc
|
Format newline in BattleBattleFrontier_BattlePikeLobby/scripts.inc
One of the strings declared in BattleFrontier_BattlePikeLobby/scripts.inc was poorly formatted.
|
2022-06-18 11:49:13 -03:00 |
|
GriffinR
|
57222323c1
|
Merge pull request #1678 from GriffinRichards/const-frontier
Add some battle frontier constant usage
|
2022-06-18 10:22:58 -04:00 |
|
GriffinR
|
d11b04f251
|
Merge pull request #1690 from Kurausukun/ai_doc
Document Design Oddity, Use Constants, Correct Comment
|
2022-06-17 22:09:43 -04:00 |
|
Kurausukun
|
d3c8346a67
|
fix type, add bugfix
|
2022-06-17 21:58:56 -04:00 |
|
Kurausukun
|
23e9455e0a
|
document design oddity, use constants, correct comment
|
2022-06-17 21:52:58 -04:00 |
|
GriffinR
|
7a6b417b8e
|
Remove UBFIX related to task destruction
|
2022-06-17 21:01:23 -04:00 |
|
GriffinR
|
de1145e790
|
Merge pull request #1688 from coltongit/patch-4
Add bugfix from bugs_and_glitches.md to BUGFIX
|
2022-06-17 17:48:53 -04:00 |
|
Colton G. Rushton
|
f02ea58a68
|
Add comment description of this bugfix
|
2022-06-17 18:32:46 -03:00 |
|
Colton G. Rushton
|
d7ab1ba588
|
Fix formatting
|
2022-06-17 18:22:47 -03:00 |
|
Colton G. Rushton
|
b885e01b39
|
Update src/item_menu_icons.c
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
|
2022-06-17 18:16:14 -03:00 |
|
Colton G. Rushton
|
b17fb2ff56
|
Delete bugs_and_glitches.md
|
2022-06-17 18:07:46 -03:00 |
|
Colton G. Rushton
|
e42498ab40
|
Add bugfix from bugs_and_glitches.md to BUGFIX
Item flicker fix now in `BUGFIX`
Supersedes and resolves #1680
Fixes #1215
Fixes #1514
|
2022-06-17 18:06:37 -03:00 |
|