ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 12:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,636 Commits 1 Branch 0 Tags 235 MiB
6c9f864651
Commit Graph

6636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eduardo Quezada
6c9f864651 Tweaking battle_config to accomodate pokemon_config and item_config 2020-10-17 10:52:44 -03:00
Eduardo Alvaro Quezada D'Ottone
1df696c1fb
Merge pull request #17 from LOuroboros/move_updates 
Updated many moves' data to Gen. 8 standards
 2020-10-15 20:56:58 -03:00
Eduardo Alvaro Quezada D'Ottone
e5ad36f643
Merge pull request #25 from Pyredrid/2v1_multibattle_fix 
2v1 multibattle fix
 2020-10-15 16:09:18 -03:00
ExpoSeed
beb19380ce
Merge pull request #21 from LOuroboros/power_items_rhh_be 
Implemented the main effect of the Power Items
 2020-10-15 10:02:06 -05:00
ExpoSeed
3b01cd3a64
Merge pull request #19 from LOuroboros/patch-4 
Removed duplicate inclusion of battle_config.h
 2020-10-15 09:43:20 -05:00
Aaron B-D
29b72700df Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 2v1_multibattle_fix 2020-10-15 10:18:54 -04:00
LOuroboros
2578a440a1 Implemented the effects of the Power Items 
For more info: https://bulbapedia.bulbagarden.net/wiki/Power_item
 2020-10-15 05:21:28 -03:00
LOuroboros
e4635525e7 Renamed the HOLD_EFFECT_EV_BOOST label 2020-10-15 04:52:03 -03:00
LOuroboros
5257ef70df Oopsie, the Gen. 8 effect should be the default one 2020-10-15 04:31:44 -03:00
LOuroboros
fcc3c6c6ba Added a way to quickly switch Rapid Spin's move effect from Gen. 3 to 8 2020-10-15 04:21:40 -03:00
LOuroboros
1635585e68
Removed duplicate inclusion of battle_config.h 
## Description
I think the title is self-explanatory, but the header file that is `include/constants/battle_config.h` is included twice unnecessarily.

## **Discord contact info**
Lunos#4026

As usual, if there's anything wrong please let me know.
 2020-10-15 02:59:48 -03:00
ExpoSeed
00fade28c0
Merge pull request #8 from ExpoSeed/sync-battle-engine-v2 
Sync battle engine v2
 2020-10-13 12:13:56 -05:00
ExpoSeed
d4e58d9746 Fix style, sync moved functions properly 2020-10-13 09:40:01 -05:00
ExpoSeed
bcfa79f4fb Remove POKEMON_SLOTS_NUMBER define 2020-10-12 21:15:50 -05:00
ExpoSeed
88b9847772 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-battle-engine-v2 2020-10-12 12:42:37 -05:00
GriffinR
46212e0d14
Merge pull request #1230 from GriffinRichards/fixubcomm 
Fix PutAwayDecorationLoop UB comment
 2020-10-11 19:16:42 -04:00
GriffinR
1472111c5d Fix PutAwayDecorationLoop UB comment 2020-10-11 19:02:10 -04:00
GriffinR
17a77c9018
Merge pull request #1229 from ghoulslash/document 
start pokenav documentation
 2020-10-11 11:59:40 -04:00
Evan
280c68b531 renamed pokenav graphics file fixes 2020-10-11 09:11:12 -06:00
Evan
f4909b4d96 align pokenav task funcs and update some pokenav menu bg gfx files 2020-10-11 08:50:58 -06:00
GriffinR
4efbdaf706
Merge pull request #1227 from kageru/pret 
Document gUnknown_03006298
 2020-10-11 07:17:09 -04:00
kageru
52ebc4252e
Document gUnknown_03006298 2020-10-11 09:54:49 +02:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
Evan
2b2be90a52 start pokenav documentation 2020-10-10 16:17:34 -06:00
GriffinR
13f37cf974
Merge pull request #1223 from GriffinRichards/constants-misc 
Add ITEM6_HEAL constants, change move flags to shifts
 2020-10-06 18:39:43 -04:00
GriffinR
ba18f4011a
Merge pull request #1225 from ExpoSeed/make-clean-rl 
Add *.rl to make clean
 2020-10-06 00:46:31 -04:00
ExpoSeed
8f7e212967 Remove *.rl in make clean 2020-10-05 23:33:55 -05:00
ExpoSeed
9c43bcb429 Delete accidentally pushed file 2020-10-05 23:33:36 -05:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
GriffinR
a33d4874d9
Merge pull request #1219 from ExpoSeed/bye-pr-template 
Eliminate most of PR template
 2020-10-04 23:38:42 -04:00
GriffinR
9b90a773d2
Merge pull request #1221 from AsparagusEduardo/Doc-newGameBerries 
Documenting where each of the berries are generated in new_game.inc
 2020-10-04 23:37:41 -04:00
Eduardo Quezada
96e4b43ce5 Documenting where each of the berries are generated in new_game.inc 2020-10-03 21:52:09 -03:00
PikalaxALT
4a773ce18d
Merge pull request #1217 from ipatix/fix_O3 
rewrite MultiBootWaitCycles as naked function
 2020-10-03 12:34:02 -04:00
PikalaxALT
f0012504c6
Merge pull request #1218 from MeatLoaf3/patch-3 
Change toOrrX and toOrrY to u8 in void FillBitmapRect4Bit, glib/blit.c
 2020-10-03 12:33:44 -04:00
ExpoSeed
94bfc31629 Eliminate most of PR template 2020-10-02 11:24:39 -05:00
MeatLoaf3
5f17b07d0c
Change toOrrX and toOrrY to u8 2020-10-02 11:17:11 -04:00
Michael Panzlaff
187c96d6e5 rewrite MultiBootWaitCycles as naked function 
Before, when compiling MultiBootWaitCycles with O3 and MODERN=1, you
might have run into problems during optimizations when the compiler tried
to optimize the function, even if declared NOINLINE.

When rewriting this function as NAKED function, this no longer happens
as the optimizer will treat it as black box and compilation will resume.
 2020-10-02 12:27:16 +02:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
Revo
22c6c03429 Remove unnecessary comments 2020-10-01 17:06:33 -05:00
Revo
7f1fa72746 :masuda: 2020-10-01 17:06:33 -05:00
ProjectRevoTPP
7c697e9536 Resolve fakematch CopyGlyphToWindow. 2020-10-01 17:06:33 -05:00
PikalaxALT
cb69835536
Merge pull request #1210 from ExpoSeed/pull-request-template 
More concise pull request template
 2020-09-27 19:25:19 -04:00
ExpoSeed
933e180dd6 Remove breaking change line 2020-09-27 18:09:35 -05:00
ExpoSeed
70f7d4f256 More concise pull request template 2020-09-27 17:59:21 -05:00
PikalaxALT
46d748a219
Create pull_request_template.md 2020-09-27 17:40:30 -04:00
PikalaxALT
00b8208914
Merge pull request #1205 from GriffinRichards/constants-itemdigits 
Use constants for item digits
 2020-09-27 17:24:48 -04:00
Aaron B-D
c4d83f0640 Fixed 2v1 Multi battles stalling indefinitely at the battle's intro 
Fixes Issue #492
 2020-09-25 17:40:38 -04:00
GriffinR
f8ce2efb55
Merge pull request #1206 from ExpoSeed/script-command-comments 
Comments for script command tables
 2020-09-25 15:13:38 -04:00
ExpoSeed
032669e2ab Change script command table comment alignment from tabs to spaces 2020-09-25 14:05:17 -05:00
ExpoSeed
3860551777 Mark unused script commands 2020-09-25 13:41:17 -05:00