ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,384 Commits 1 Branch 0 Tags 235 MiB
e8dd8f93d1
Commit Graph

4384 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fontbane
e8dd8f93d1 Remove Honey functionality 2019-04-05 10:33:19 -04:00
Fontbane
7bc3cdf527 Delete level variable 2019-04-05 10:16:41 -04:00
Fontbane
562ad70915 Removed Gen 4 Ability field effects 2019-04-01 23:07:21 -04:00
Fontbane
2cfa5ea326 Fixed Honey 
And updated gitignore
 2019-03-25 19:00:46 -04:00
Fontbane
fc69631a10 Field effects for Gen IV Abilities 
Also added Honey (acts like White Flute for now) and made it so the Griseous Orb can't be removed from Giratina in battle.
 2019-03-25 17:49:29 -04:00
AJ Fontaine
cf0e38b11f
Can't Knock Griseous Orb Off Giratina 
I'll do Plates Drives and Memories later
 2019-03-24 22:33:54 -04:00
DizzyEggg
7018745230 Fix Defiant stat raise by allies 2019-03-23 17:21:14 +01:00
DizzyEggg
d1fb5fa148 Remove unnecessary condition from Cursed Body 2019-03-23 16:59:58 +01:00
DizzyEggg
b8a634770f Touch up Weak Armor 2019-03-23 16:56:56 +01:00
DizzyEggg
b9052fb37d Touch Up Justified and Rattled 2019-03-23 16:37:56 +01:00
DizzyEggg
e135ea47e5 Touch up Anger Point 2019-03-23 16:33:08 +01:00
DizzyEggg
53c60ab292 Merge branch 'master' into battle_engine_v2 2019-03-23 15:54:08 +01:00
DizzyEggg
cbdecf2f8d Make it compile 2019-03-23 09:51:27 -05:00
DizzyEggg
77c4856e62 Nonmatchings go away 2019-03-23 09:51:27 -05:00
huderlem
abe56579c1
Merge pull request #622 from huderlem/ereader 
Finish decompiling ereader and faraway island code
 2019-03-22 14:40:50 -05:00
Marcus Huderle
253de64e63 Merge remote-tracking branch 'upstream/master' into ereader 2019-03-22 14:35:47 -05:00
Marcus Huderle
a7d5f032b1 Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c 2019-03-22 14:16:26 -05:00
Marcus Huderle
f4f666f5af Finish decompiling ereader.c 2019-03-22 13:36:06 -05:00
DizzyEggg
54ab6b43dc Merge with master 2019-03-22 10:40:31 +01:00
Marcus Huderle
768a68d3e8 Decompile ereader.c up to faraway island code 2019-03-21 18:36:12 -05:00
Marcus Huderle
7118462b9f Decompile ereader.c up to faraway island code 2019-03-21 18:28:44 -05:00
huderlem
7154d2614d
Merge pull request #595 from Phlosioneer/move-tutor 
Move tutor
 2019-03-17 17:32:42 -05:00
Marcus Huderle
e9a3cc6d51 Merge remote-tracking branch 'upstream/master' into move-tutor 
# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c
 2019-03-17 17:20:40 -05:00
Marcus Huderle
4ae8a52473 Finish decompiling contest_painting_effects.c 2019-03-17 16:25:18 -05:00
Phlosioneer
691392fd5d Clean up intro_credits_graphics constants 2019-03-16 12:37:04 -05:00
Phlosioneer
a029254faa Apply new macros to intro graphics struct 2019-03-16 12:37:04 -05:00
Phlosioneer
eeb329909c Fix anonymous struct 2019-03-16 12:37:04 -05:00
Phlosioneer
9848f84b9e Use constants for Oam .shape and .size fields 
Also some general formatting fixes for constants.
 2019-03-16 12:37:04 -05:00
Phlosioneer
291df27dcb Use new MUS_NONE constant in sound.c 2019-03-16 12:31:29 -05:00
Phlosioneer
092608aef6 Add a constant for "no music" on maps. 2019-03-16 12:31:29 -05:00
aueuaio
b67c0698c2 add troubleshooting line in INSTALL.md 
While following the instructions for macos (i have sierra) in INSTALL.md, agbcc/build.sh failed, complaining it couldn't find the /opt/devkitpro/devkitARM/base_tools file. After a bit of research, i found out this file is in the devkitarm-rules package (in the devkitpro repos for pacman). Since installing this package fixes the problem, i added some troubleshooting instructions for it in INSTALL.md.
 2019-03-16 12:27:30 -05:00
Phlosioneer
61fa4cf2ba Make a powershell version of asmdiff.sh 
This version can be used with VSCode's built-in diff, and has better
error detection for new contributors.
 2019-03-16 12:26:01 -05:00
Phlosioneer
703554c4df Ranges are magic 2019-03-16 12:25:02 -05:00
Phlosioneer
61344a4fee Document the water droplet data. 2019-03-16 12:25:02 -05:00
garak
d0115db565 move pokemon graphics to mon-specific directories 2019-03-16 12:21:47 -05:00
garak
14211fb495 fix incbin paths 2019-03-16 12:21:47 -05:00
Phlosioneer
8e1537fb57 Document map name popup flag 2019-03-10 09:23:58 -05:00
huderlem
32f71b2976
Merge pull request #600 from Phlosioneer/summary-screen-macros 
Summary screen macros
 2019-03-08 13:37:12 -06:00
huderlem
f235d07db5
Merge pull request #590 from Phlosioneer/ok-bot-symbol-counting 
Improve OK bot's symbol counting
 2019-03-08 13:35:57 -06:00
huderlem
d637317e32
Merge pull request #592 from Phlosioneer/extern-cleanup 
Extern cleanup
 2019-03-08 13:28:49 -06:00
DizzyEggg
34cbb26e5e Synchronoise third type support 2019-03-08 10:30:23 +01:00
DizzyEggg
c329252ce3 Add Safety Googles effect 2019-03-08 10:16:54 +01:00
Phlosioneer
c3feb9871f Use PIXEL_FILL macro 2019-03-08 04:02:05 -05:00
Phlosioneer
622096a9d3 spaces => tabs 2019-03-08 04:00:11 -05:00
Phlosioneer
146c194b0c Actually change the variable name this time 2019-03-08 03:12:08 -05:00
Phlosioneer
5886f82ef5 Merge branch 'master' into extern-cleanup 2019-03-08 02:45:26 -05:00
Phlosioneer
eaddf396b2 I was dumb and forgot to add merge fixes 2019-03-08 02:35:19 -05:00
Phlosioneer
b93d923826 Merge branch 'master' into move-tutor 2019-03-08 02:27:20 -05:00
Phlosioneer
eac70acab6 Change filename to something more descriptive 2019-03-08 02:17:01 -05:00
Phlosioneer
af182d6f16 Minor cleanup before pushing 2019-03-08 02:10:44 -05:00