GriffinR
|
64460e01ae
|
Merge pull request #1314 from GriffinRichards/doc-controllers
Document battle controllers, misc other battle
|
2021-02-02 00:24:16 -05:00 |
|
GriffinR
|
7e26aa3d21
|
Merge pull request #1316 from GriffinRichards/doc-scrcmd
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
|
2021-02-01 21:04:00 -05:00 |
|
ultima-soul
|
5fdb578747
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2021-02-01 15:58:18 -08:00 |
|
ultima-soul
|
2a20d50904
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-02-01 15:54:08 -08:00 |
|
amiosi
|
940ca8dc19
|
category decap and length
|
2021-02-01 15:25:53 -05:00 |
|
LOuroboros
|
fc04c6974b
|
Edit->Blank Operations->Trim Trailing Space for the win
|
2021-02-01 17:05:49 -03:00 |
|
GriffinR
|
90513a9d72
|
Merge pull request #1318 from GriffinRichards/bardmoves
Minor bard music clean up
|
2021-02-01 14:59:45 -05:00 |
|
amiosi
|
102285d464
|
mons/moves
|
2021-02-01 14:37:48 -05:00 |
|
amiosi
|
35f3cdd2f2
|
decap POKeMON string
|
2021-02-01 14:19:24 -05:00 |
|
Evan
|
1c75483f51
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ripen
|
2021-01-31 23:31:38 -07:00 |
|
Evan
|
f428e5e2dc
|
some quick claw/custap berry fixes
|
2021-01-31 23:31:27 -07:00 |
|
ultima-soul
|
a41300a6dc
|
Merge pull request #1386 from Lukien/battle_engine
Added weather check for ability sand force
|
2021-01-31 22:01:21 -08:00 |
|
Lukien
|
9704049818
|
Merge remote-tracking branch 'upstream/battle_engine' into battle_engine
|
2021-01-31 22:46:27 -05:00 |
|
Lukien
|
f69bff6605
|
Update battle_util.c
Added weather check for the ability Sand Force.
|
2021-01-31 22:43:16 -05:00 |
|
ultima-soul
|
eb78b5434c
|
Merge pull request #1377 from ghoulslash/thaw
Update Thawing Moves
|
2021-01-31 13:57:44 -08:00 |
|
Evan
|
be0326301d
|
erge branch 'thaw' of https://github.com/ghoulslash/pokeemerald into thaw
|
2021-01-31 14:55:56 -07:00 |
|
Evan
|
552f548700
|
fix IsThawingMove
|
2021-01-31 14:55:44 -07:00 |
|
ghoulslash
|
9499469337
|
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-01-31 14:43:24 -07:00 |
|
ultima-soul
|
76851eb672
|
Merge pull request #1380 from amiosi/kyurem
Kyurem form moveset swap
|
2021-01-31 13:32:31 -08:00 |
|
ExpoSeed
|
8b8d4d4a9f
|
Merge pull request #1376 from ghoulslash/fire_blast
Fix Fire Blast Power
|
2021-01-31 15:24:52 -06:00 |
|
ExpoSeed
|
0f8e47547a
|
Merge pull request #1382 from amiosi/kings_rock
Kings rock build fix
|
2021-01-29 17:52:49 -06:00 |
|
GriffinR
|
45ee3a687d
|
Add comments for some data in crt0.s
|
2021-01-29 18:36:39 -05:00 |
|
amiosi
|
ae2b8be147
|
Update battle_moves.h
|
2021-01-29 18:07:36 -05:00 |
|
amiosi
|
fe3419fa21
|
Update level_up_learnsets.h
|
2021-01-29 15:51:53 -05:00 |
|
ghoulslash
|
00085d9d90
|
Merge pull request #1321 from amiosi/battle_engine
remove redundant minimize interactions and add move config ifs
|
2021-01-29 12:24:56 -07:00 |
|
opakedragon
|
1e8edcbfcd
|
Revert "Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow""
This reverts commit be50fab8f2.
|
2021-01-29 13:36:24 -05:00 |
|
opakedragon
|
be50fab8f2
|
Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow"
This reverts commit 3a6be5a34c.
|
2021-01-29 13:30:09 -05:00 |
|
ultima-soul
|
96232ea166
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-01-28 23:59:08 -08:00 |
|
GriffinR
|
12af03cd62
|
Label bard music pitch table
|
2021-01-28 16:36:56 -05:00 |
|
GriffinR
|
89b85a49ec
|
Index gBardSounds_Moves and gBardSounds_Pokemon with constants
|
2021-01-28 15:55:33 -05:00 |
|
ExpoSeed
|
857fc9ce95
|
Merge pull request #1320 from amiosi/item_expansion
update item effects, prices, names & descriptions
|
2021-01-28 12:15:11 -06:00 |
|
Evan
|
a104c156cc
|
thaw move list function
|
2021-01-28 09:00:46 -07:00 |
|
Evan
|
34908a2252
|
fix fire blast power
|
2021-01-27 19:56:11 -07:00 |
|
ultima-soul
|
0f142048bf
|
Merge pull request #1373 from LOuroboros/riolu
Corrected Riolu's evo method
|
2021-01-27 14:07:27 -08:00 |
|
LOuroboros
|
6e89f8dff2
|
Corrected Riolu's evo method
|
2021-01-27 19:02:37 -03:00 |
|
LOuroboros
|
cfa6fc5eb8
|
Fixed Keldeo Resolute's animation
|
2021-01-27 15:26:39 -03:00 |
|
LOuroboros
|
99c7797dc8
|
Fixed Deoxys Attack Form's animation
|
2021-01-27 15:06:49 -03:00 |
|
opakedragon
|
3a6be5a34c
|
Fix Spelling of BagMenu_RemoveBagItemMessageindow
|
2021-01-27 06:18:29 -05:00 |
|
ghoulslash
|
345987c9f9
|
Merge pull request #1367 from LOuroboros/gastro_acid
Updated the list of abilities unaffected by Gastro Acid
|
2021-01-26 21:42:12 -07:00 |
|
ghoulslash
|
ef5faf94de
|
Merge pull request #1369 from LOuroboros/trace
Updated the list of untraceable abilities
|
2021-01-26 21:41:50 -07:00 |
|
ghoulslash
|
55b9bc7e17
|
Merge pull request #1366 from LOuroboros/patch-1
Fixed Mind Blown's category
|
2021-01-26 21:41:07 -07:00 |
|
luckytyphlosion
|
740c0a6bc1
|
Merge pull request #1294 from luckytyphlosion/aif2pcm-fix
Fix bug in pcm delta compression.
|
2021-01-26 15:23:11 -05:00 |
|
luckytyphlosion
|
b0de03356b
|
Merge pull request #1315 from PokeCodec/patch-3
Use INTR_FLAG_VBLANK instead of constant 0x1
|
2021-01-26 15:22:24 -05:00 |
|
luckytyphlosion
|
ff8952a3f0
|
Merge pull request #1308 from PokeCodec/pain
Get rid of Task_data_OP macro
|
2021-01-26 15:22:13 -05:00 |
|
GriffinR
|
92bd6400b7
|
Fix up berry sparkle
|
2021-01-26 05:40:34 -05:00 |
|
GriffinR
|
9e59581220
|
Document object lock and some trainer approach
|
2021-01-26 04:42:18 -05:00 |
|
GriffinR
|
0064333e4a
|
Clean up scrcmd.c
|
2021-01-26 02:16:26 -05:00 |
|
N
|
b1a29e5017
|
Use INTR_FLAG_VBLANK instead of constant 0x1
|
2021-01-25 21:37:04 -05:00 |
|
LOuroboros
|
c4a7205b6f
|
Added As One to the untraceable abilities list
|
2021-01-25 15:37:11 -03:00 |
|
LOuroboros
|
7c9ddd23c1
|
Updated the list of untraceable abilities
|
2021-01-25 14:55:51 -03:00 |
|