Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,879 Commits 1 Branch 0 Tags
Commit Graph

539 Commits

Author SHA1 Message Date
GriffinR
bd023b1c6c
Merge pull request #1796 from GriffinRichards/tilesets-c 
Convert tilesets.s to C
 2022-10-10 12:47:47 -04:00
GriffinR
65d3944a93 Give tileset palettes proper type, name compressed secret base tiles 2022-10-08 02:02:12 -04:00
Ariel A
3a86c8bd4c Merge branch 'followers' into lighting 2022-10-07 21:08:06 -04:00
Ariel A
1c011a9c1c Merge branch 'master' into followers 2022-10-07 20:52:15 -04:00
GriffinR
e293986fbb
Merge pull request #1793 from GriffinRichards/clean-shop 
Clean up shop.c
 2022-10-06 17:24:53 -04:00
GriffinR
1f225286d5 Use window constants in party_menu 2022-09-29 12:55:31 -04:00
GriffinR
6db489e2d5 Use constants for overworld object palette slots 2022-09-27 20:16:48 -04:00
GriffinR
4f407a1066 Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
GriffinR
f0744641d1
Merge pull request #1651 from garakmon/entry_json 
use json for region map sections
 2022-09-25 21:56:09 -04:00
GriffinR
171367d66c
Merge pull request #1643 from cbt6/object-event-graphics-info 
Format object event graphics info
 2022-09-25 21:55:22 -04:00
GriffinR
56c28fb2dd Move region map gitignore to existing data gitignore 2022-09-25 18:15:16 -04:00
GriffinR
e473aaf783 Merge branch 'master' of https://github.com/pret/pokeemerald into entry_json 2022-09-25 18:10:04 -04:00
GriffinR
7223dbd62f
Merge branch 'master' into rme-update 2022-09-25 11:56:57 -04:00
GriffinR
1107ff954d Clean up shop.c 2022-09-22 15:08:17 -04:00
GriffinR
9bcc36fe08
Merge pull request #1767 from GriffinRichards/trainer-pals 
Generate trainer pic palettes from image
 2022-09-22 11:34:03 -04:00
Eduardo Quezada
65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
Ariel A
e54c18fb8e Merge branch 'followers' into lighting 2022-09-10 22:29:18 -04:00
Eduardo Quezada
1fa9bc1b5c Adjusted style of coords tables 2022-09-08 18:32:01 -04:00
Eduardo Quezada
12bb32666b Aligned FRONTIER_MONS trainer macros with the rest for consistency 2022-09-06 17:05:56 -04:00
GriffinR
c8afeea182 Generate trainer pic palettes from image 2022-09-05 16:09:45 -04:00
tustin2121
33f10d2139 Adding missing externs 
If there are not externs on these forward declarations, it's entirely possible for the program to link and missing data to be assigned to someplace presumed in IWRAM or something.
 2022-09-05 09:49:20 -04:00
Ariel A
5c7ee40171 Fixed follower ledge jumps. 2022-08-28 23:50:06 -04:00
GriffinR
898ec580ae
Merge pull request #1737 from GriffinRichards/lock-unlock 
Clean up lock/unlock anim movement
 2022-08-22 01:30:33 -04:00
GriffinR
30906762ed
Merge pull request #1740 from AsparagusEduardo/pret_stringTabs 
Fixed inconsistent use of white space for scripts, .c files and .h files.
 2022-08-20 23:03:59 -04:00
GriffinR
81ef818f61
Merge pull request #1731 from GriffinRichards/missing-tag 
Move party menu data constants
 2022-08-20 22:43:52 -04:00
Ariel A
0b1c81af66 Merge branch 'romhack' into lighting 2022-08-17 19:59:58 -04:00
Ariel A
7edb7bbc23 Added battle slide-in animation for Pokemon follower. 2022-08-16 19:52:38 -04:00
Eduardo Quezada
5933c42439 Synced Route 4 and 10's MapSec labels 2022-08-16 18:23:37 -04:00
Eduardo Quezada
e8a05e92e4 Corrected additional inconsistent uses of whitespace 2022-08-15 17:04:34 -04:00
GriffinR
5515e328b2 Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
GriffinR
f534e8e44a Move party menu data constants 2022-08-10 14:30:01 -04:00
Ariel A
3cae019253 Fixed graphical glitch on Route 120 bridge introduced in 418cab092c. 2022-08-03 20:30:52 -04:00
GriffinR
99a37b5aa5
Merge pull request #1717 from mrgriffin/trainer-party-macro 
Macros for keeping .partyFlags, .partySize, and .party in sync
 2022-08-02 13:11:43 -04:00
Eduardo Quezada
2e1bf0d965 OamData mosaic FALSE 2022-07-29 21:27:39 -04:00
Martin Griffin
2380d13a43 Macros for keeping .partyFlags, .partySize, and .party in sync 2022-07-27 23:25:37 +01:00
Ariel A
c2156b96b3 Fixed old Dusclops OW sprite. 2022-07-18 00:44:59 -04:00
Ariel A
671fa68410 Merge branch 'romhack' into lighting 2022-07-17 16:07:50 -04:00
Ariel A
9beee311c4 Merge branch 'master' into romhack 2022-07-17 15:13:15 -04:00
GriffinR
277750b088
Merge branch 'master' into rme-update 2022-06-22 10:02:17 -04:00
GriffinR
7143865f6f Add some battle frontier constant usage 2022-06-09 12:57:28 -04:00
Ariel A
d731485a1f Fixed shadows appearing above freshly spawned object events. 
Removed shadows from cuttable trees.
 2022-05-29 01:46:09 -04:00
sneed
c8e08edbae rename item1 and item2 in BaseStats 2022-05-23 19:10:24 +03:00
Ariel A
6d79b6dbaa Merge branch 'romhack' into lighting 2022-05-18 20:14:22 -04:00
Ariel A
01f73f54e1 Added follower transform effect and Castform forms. Credit: larryturbo 
Castform forms from https://www.deviantart.com/larryturbo/art/351-Castform-Froms-830190053
 2022-05-18 19:12:30 -04:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
Ariel A
9862b0f63d Merge branch 'romhack' into lighting 2022-05-11 20:44:48 -04:00
Ariel A
28ec60a776 Fixed some field effect palettes. Removed leftover CacheLightMetatiles. 2022-05-10 23:21:54 -04:00
Ariel A
19df355574 Merge branch 'romhack' into lighting 2022-05-03 23:01:52 -04:00
Ariel A
831c73c18c Added system for conditional follower messages. 2022-05-03 23:01:02 -04:00
GriffinR
fc5747f0f7
Merge pull request #1649 from GriffinRichards/clean-trainer 
Trainer hill clean up
 2022-04-20 00:20:44 -04:00