Commit Graph

463 Commits

Author SHA1 Message Date
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
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
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
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
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
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
sneed c8e08edbae rename item1 and item2 in BaseStats 2022-05-23 19:10:24 +03:00
GriffinR 593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00: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
garakmon 3fe423a6f4 use json for region map sections
- update nlohmann/json and pantor/inja in tools/
  - create new inja template
2022-04-04 23:32:03 -04:00
GriffinR 328b925a08 Move trainer hill map data to bin files 2022-03-31 14:08:31 -04:00
GriffinR 62f3f144ab Clean up some trainer hill 2022-03-31 12:54:07 -04:00
GriffinR 0a0157b62c Name unknown_16.png 2022-03-14 15:54:47 -04:00
cbt6 3cc21a0fc8 Format object event graphics info 2022-03-13 05:19:16 +08:00
GriffinR b1d61b9227 Merge pull request #1641 from GriffinRichards/subsprite-arr-count
Use ARRAY_COUNT for obj event subsprite tables
2022-03-03 23:08:52 -05:00
GriffinR f78f46a1e2 Use ARRAY_COUNT for obj event subsprite tables 2022-03-03 14:54:05 -05:00
GriffinR 5d58cdd297 Fix bunny hoppy typo 2022-02-28 13:34:39 -05:00
GriffinR 8b43cffe09 Move remaining region map graphics to region map folder 2022-02-22 18:43:23 -05:00
GriffinR ed70b81ba0 Use constants for region map layout 2022-02-22 18:29:21 -05:00
GriffinR a0c127f72c Move region map layout to C 2022-02-22 18:13:11 -05:00
GriffinR 131ed1916e Generalize name of party slot without HP 2022-02-15 16:24:19 -05:00
GriffinR 49eca60955 Convert party menu slots to bin files 2022-02-15 16:12:54 -05:00
GriffinR 694aa3c65d Move balls, shop, link, map popups, and bag out of interface 2022-01-11 13:53:23 -05:00
GriffinR 565dd24309 Move party menu graphics out of interface 2022-01-11 11:37:13 -05:00
GriffinR 577e6cc740 Merge pull request #1586 from GriffinRichards/clean-areascreen
Clean up pokedex_area_screen
2022-01-06 23:02:23 -05:00
GriffinR 713cd6616e Add glow tile empty 2022-01-06 22:33:00 -05:00
GriffinR 23f5c9fd5c Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
GriffinR aadab8b016 Move pokemon and easy chat constants to global, misc clean-up 2021-12-28 18:07:41 -05:00
LOuroboros 4a74d288d4 Review corrections 2021-12-18 00:01:50 -03:00