ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-19 13:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
5,086 Commits 1 Branch 0 Tags 235 MiB
cda75bca70
Commit Graph

5086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phlosioneer
9372731c3e Merge branch 'master' into main-menu-state-machine 2019-03-02 17:35:44 -05:00
Phlosioneer
3716da5430 Rename macro with correct name for pixel values 2019-03-02 17:25:39 -05:00
Phlosioneer
80a4ee1145 Remove water.h and flying.h 2019-03-02 17:23:10 -05:00
DizzyEggg
5c3d755ac6 Effect Spore not affected by overcoat 2019-03-02 22:48:55 +01:00
DizzyEggg
5dd7ab98d1
Merge pull request #99 from LOuroboros/battle_engine_v2 
Various Things
 2019-03-02 22:42:50 +01:00
LOuroboros
6332023267 Oops. NOW I fixed the 2nd typo. 2019-03-02 12:59:38 -03:00
LOuroboros
5c1cf3063f Implemented the sprites for the Gen. 6 items. 2019-03-02 12:42:53 -03:00
LOuroboros
e15c745cf5 Fixed 2 typos. Loppunite>Lopunnite and Loppunny>Lopunny. 2019-03-02 12:35:11 -03:00
LOuroboros
07f9bcad10 Swapped Keystone with Mega Bracelet. 2019-03-02 12:31:43 -03:00
DizzyEggg
043071ae12 Don't extern gMoveNames 2019-03-02 08:25:14 -06:00
huderlem
ee9694d9ba
Merge pull request #587 from Phlosioneer/document-all-event-vars 
Document all event vars
 2019-03-02 08:24:46 -06:00
DizzyEggg
bf70861798 Powder moves on grass types 2019-03-02 13:08:50 +01:00
DizzyEggg
8e9296a42b Fix team messages 2019-03-02 12:31:07 +01:00
DizzyEggg
159d1089a7 Crunch lowers Defense 2019-03-02 12:17:41 +01:00
DizzyEggg
c9c38024e3 Fix move reminder 2019-03-02 12:13:09 +01:00
DizzyEggg
818c44285d
Merge pull request #96 from LOuroboros/battle_engine_v2 
Fixed the file extensions of the new item sprites.
 2019-03-02 11:41:18 +01:00
Phlosioneer
25050b9944 Fix tabs, do suggested rename 2019-03-02 04:13:27 -05:00
Phlosioneer
49bef25856 Clean up the last extern functions 2019-03-02 03:18:08 -05:00
Phlosioneer
ee69426838 Eliminate more externs 2019-03-02 02:44:02 -05:00
Phlosioneer
0f6cc27e81 Fixed decomp issue around LoadPalette 
In LoadLinkPartnerEventObjectSpritePalette, using paletteNum += 6 causes
GCC to "mark" paletteNum's register as a possible overflow, even though
it performs the overflow check. Then, when passing args to LoadPalette,
GCC fails to recognize that 0x100 + ((any u8) << 4) can never overflow
as a u16. It then does an overflow check before calling LoadPalette.

Assigning to a temp variable seems to avoid this "marking" behavior.
 2019-03-02 00:36:59 -05:00
LOuroboros
ae3ed962d1 Fixed the file extensions of the new item sprites. 2019-03-02 01:20:16 -03:00
Phlosioneer
3ceb1667c9 Reduce externs 2019-03-01 22:32:50 -05:00
huderlem
3b04cfa437
Merge pull request #551 from Phlosioneer/multiplayer-stuff 
Document overworld.c and link stuff in general
 2019-03-01 08:43:55 -06:00
DizzyEggg
eea162d3d8 Effect Spore ability pop-up 2019-03-01 13:59:08 +01:00
DizzyEggg
fa81559793 Fix Sturdy's pop-up 2019-03-01 13:53:06 +01:00
DizzyEggg
201b68413d
Merge pull request #92 from LOuroboros/fileformat 
Implemented the sprites for the Gen. 4 and 5 items.
 2019-03-01 13:40:23 +01:00
DizzyEggg
bfe95bc4b9 Merge branch 'master' into battle_engine_v2 2019-03-01 13:29:50 +01:00
Phlosioneer
a7e5852f1d More minor fixes 2019-03-01 01:49:11 -05:00
Phlosioneer
459fd93b59 Fix minor errors 2019-03-01 01:18:58 -05:00
Phlosioneer
d0f665fddc Fix tabs 2019-03-01 01:09:53 -05:00
Phlosioneer
2d0e0083bb Improve OK bot's symbol counting 2019-03-01 01:06:27 -05:00
Phlosioneer
da0687987d Pick better names for constants 2019-02-28 22:21:16 -06:00
Phlosioneer
189d387f01 Add macros for metatile manipulation 2019-02-28 22:21:16 -06:00
hondew
9ed0f77528 fixed issues in data and include dirs 2019-02-28 21:21:56 -06:00
hondew
53d7e21332 fix formatting in slot_machine.c 2019-02-28 21:21:56 -06:00
hondew
6a4202cdbd tidied lucky flags 2019-02-28 21:21:56 -06:00
hondew
1dc0d346d9 fix spelling error 2019-02-28 21:21:56 -06:00
hondew
dd8ecabe26 fix mistakes and bad formatting 2019-02-28 21:21:56 -06:00
hondew
f965f1b13d label luckyFlags 2019-02-28 21:21:56 -06:00
hondew
a6eb879267 minor reeltime changes 2019-02-28 21:21:56 -06:00
hondew
47a3477ab1 finish DecideReelTurns 2019-02-28 21:21:56 -06:00
hondew
f8f046c850 clean up slot machine more 2019-02-28 21:21:56 -06:00
hondew
67fe781ed2 clean up slot machine until AwardPayout 2019-02-28 21:21:56 -06:00
hondew
5c8cc5225f document slot machine 2019-02-28 21:21:56 -06:00
LOuroboros
9564de6edb Implemented the sprites for the Gen. 4 and 5 items. 2019-03-01 00:06:31 -03:00
DizzyEggg
baf95a8e7a get rid of ugly cast 2019-02-28 17:26:09 -06:00
DizzyEggg
cebada80d0 Merge with master 2019-02-28 20:56:52 +01:00
Phlosioneer
99bfd8c80f VAR_0x3F20 is not a var 2019-02-28 00:10:44 -05:00
Phlosioneer
373d73eb3b Fix last special var 2019-02-28 00:06:27 -05:00
Phlosioneer
bf45b83c65 Finish documenting event vars 2019-02-27 23:54:51 -05:00