LOuroboros
bf679fc99e
Tweaked Task_ShowAiKnowledge too
2021-06-02 17:42:55 -03:00
LOuroboros
e65f8dfd0e
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_debug
2021-06-02 17:40:17 -03:00
GriffinR
a21ceb2e3c
Merge pull request #1457 from Kurausukun/const
...
Re-add const to gEvolutionTable in daycare.c
2021-06-02 16:28:39 -04:00
LOuroboros
03647c7790
Adjusted the list of item hold effects
2021-06-02 17:27:45 -03:00
LOuroboros
6ccb493f12
Adjusted the list of item hold effects
2021-06-02 17:23:58 -03:00
LOuroboros
586c76d93a
Changed Clanging Scales' secondaryEffectChance to 0
...
Review request.
2021-06-02 16:46:28 -03:00
LOuroboros
1b13db80fc
Syntax fix
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-06-02 16:43:01 -03:00
LOuroboros
a60fd31b9f
Added the MOVE_EFFECT_CERTAIN arg to BattleScript_EffectAttackerDefenseDownHit
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-06-02 16:42:02 -03:00
luckytyphlosion
92152e45e2
Fixes to makefile.
...
Merge C_ASM_DEP and DATA_ASM_DEP, NODEP and SCAN_DEPS can be overridden, add --no-print-directory to MAKEFLAGS in make_tools.mk (also removed some unused variables), add newline to help message in preproc.
2021-06-01 23:22:15 -04:00
ultima-soul
255be1a0c4
Merge pull request #1423 from BuffelSaft/body-press
...
Implement Body Press's effect
2021-06-01 18:42:54 -07:00
BuffelSaft
2a6b989c92
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press
2021-06-02 12:41:28 +12:00
luckytyphlosion
f0b41debc3
Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps
2021-06-01 20:40:27 -04:00
luckytyphlosion
a839463c84
Optimize Makefile.
...
Don't do recursive makes for COMPARE and MODERN, use minimal makefile for making tools.
2021-06-01 20:40:11 -04:00
LOuroboros
c21a00a5d1
Replaced magic numbers with constants in BattleScript_NotAffectedAbilityPopUp
2021-06-01 18:20:33 -03:00
LOuroboros
d48a6e00d4
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into oblivious
2021-06-01 18:15:01 -03:00
Kurausukun
5c6b8ea8d6
re-add const to gEvolutionTable in daycare.c
2021-06-01 17:14:45 -04:00
DizzyEggg
dd88be659c
Get rid of SOUND_PAN_ATTACKER in launchtemplate
2021-06-01 13:44:02 +02:00
DizzyEggg
72b7cb2dad
Merge pull request #1474 from LOuroboros/overdrive
...
Fixed Overdrive's animation
2021-06-01 13:33:11 +02:00
Kurausukun
9f5bf65fb3
[PROBABLY LEAK-INFORMED] fix battle_transition fakematch, make
...
consistent use of SOME_VRAM_STORE
2021-05-31 18:12:35 -05:00
Kurausukun
2bbaf71998
[LEAK-INFORMED] fix CreateShedinja fakematch
...
info: the header change is required. accesses to the struct need to be
treated as non-const, even though the array must be const. thanks to
jiang for figuring this out.
2021-05-31 08:20:46 -05:00
Kurausukun
2705f2e5f4
[LEAK-INFORMED] also pretty dumb
2021-05-31 08:20:46 -05:00
Kurausukun
42021db743
[LEAK-INFORMED] literal dumbest fakematch ever
2021-05-31 08:20:46 -05:00
luckytyphlosion
823c862e4f
Merge pull request #1274 from luckytyphlosion/master
...
Improve INSTALL.md
2021-05-29 10:29:15 -04:00
ultima-soul
0420332270
Merge pull request #1396 from amiosi/old_findings
...
Update Many moves' data to Gen 8 Standard
2021-05-28 17:06:53 -07:00
amiosi
b588e94395
more requested changes
2021-05-28 15:05:33 -04:00
MandL27
2d92f23240
Merge pull request #1514 from pineapplemachine/pokemon_expansion_evo_fix
...
Fixes to pokemon_expansion species evolution data: Galarian Ponyta, Tranquill, and Kubfu
2021-05-28 11:31:25 -04:00
Sophie Kirschner
1a4c6d3490
Fixes to species evolution data
2021-05-28 18:16:52 +03:00
amiosi
7b530a34bf
finish requested changes
2021-05-27 20:14:46 -04:00
luckytyphlosion
c5b262159d
Merge branch 'master' of https://github.com/pret/pokeemerald
2021-05-27 16:36:47 -04:00
luckytyphlosion
8b45c8e48a
Fix github links to pret's.
2021-05-27 16:20:13 -04:00
amiosi
03a7020512
double oops
2021-05-27 16:16:12 -04:00
amiosi
36c977d9eb
oopsie
2021-05-27 16:01:34 -04:00
amiosi
f7651fd592
most fixes from requested changes
2021-05-27 15:55:19 -04:00
amiosi
fc81994579
Merge branch 'battle_engine' into old_findings
2021-05-27 15:28:02 -04:00
gAlfonso-bit
c9c5586068
Fixed ChangeBgY_ScreenOff‘s signature. ( #1447 )
...
* Fix Functions
* Fix ChangeBgY_ScreenOff signature
* Remove unneeded changes
* Fix argument mismatch
Just to get this out of the way
* Not needed
* Update palette.c
2021-05-27 07:32:09 -05:00
GriffinR
2b062e89c1
Merge pull request #1448 from Kurausukun/dumb
...
[LEAK-INFORMED] Fix Fakematch in DrawWallpaper
2021-05-25 04:41:15 -04:00
Kurausukun
5d5327c0b7
better match
2021-05-25 04:32:47 -04:00
Kurausukun
5ae5cf110d
[LEAK-INFORMED] fix fakematch in DrawWallpaper
2021-05-25 04:03:11 -04:00
Blackforest92
d1261165b8
Fixes to Shroomish, Popplio, Xerneas Active and Minior Meteor
2021-05-25 11:44:47 +07:00
ultima-soul
eedd374a5f
Merge pull request #1420 from Blackforest92/pokemon_expansion
...
Added missing gen8 battle sprites and available icons and various fixes
2021-05-24 21:13:12 -07:00
Blackforest92
d74492b591
Returning Alcremie back to monkey
2021-05-25 10:57:06 +07:00
Blackforest92
2dccce7675
Erased Eternamax comment in src/data/pokemon_graphics/enemy_mon_elevation.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-25 09:17:50 +07:00
Kurausukun
94939e395b
one last goto
2021-05-24 13:31:54 -05:00
ultima-soul
1f859e340d
Merge pull request #1415 from ghoulslash/item_expansion
...
Add Berry Hold Effects
2021-05-24 11:07:35 -07:00
ghoulslash
64815a5f85
Update src/data/items.h
...
Co-authored-by: ExpoSeed <43502820+ExpoSeed@users.noreply.github.com>
2021-05-24 10:18:05 -06:00
ghoulslash
5aa1b5b1ee
Update src/data/items.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-24 10:17:59 -06:00
ghoulslash
39974b05f7
Update src/data/items.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-24 10:17:55 -06:00
ghoulslash
a3b092c9a3
Update src/data/items.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-24 10:17:51 -06:00
ghoulslash
6b868a028a
Update src/data/items.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-24 10:17:47 -06:00
ghoulslash
aafc8e2109
Update src/data/items.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-24 10:17:39 -06:00