Commit Graph
100 Commits
Author SHA1 Message Date
GriffinR b3c2c7291f Merge pull request #534 from GriffinRichards/sync-scriptcmds
Sync script commands
2022-08-14 17:28:52 -04:00
GriffinR 442935bba0 Delete random text file 2022-08-12 20:02:49 -04:00
GriffinR a530bb3a74 Merge pull request #533 from GriffinRichards/sync-naming-screen
Sync naming screen
2022-08-12 10:43:54 -04:00
GriffinR 84d47d2c85 Merge pull request #531 from GriffinRichards/doc-dodrio
Sync dodrio berry picking
2022-08-11 14:53:28 -04:00
GriffinR f113da30ad Use 'goto_if_eq VAR, value, Script' syntax 2022-08-09 20:41:54 -04:00
GriffinR 60fc8c5e22 Add remaining event.inc comments 2022-08-09 20:27:42 -04:00
GriffinR 3add78dbd1 Use constants for setfieldeffectargument 2022-08-09 20:12:26 -04:00
GriffinR fbdbc5851c Add npc text color constants 2022-08-09 16:06:51 -04:00
GriffinR 0c1adf2115 Use seteventmon 2022-08-09 15:29:16 -04:00
GriffinR 8e7dd94eca Drop some optional script command arguments 2022-08-09 15:25:44 -04:00
GriffinR acb480f1c1 Sync event.inc and scrcmd.c 2022-08-09 15:10:38 -04:00
GriffinR bf544e84cf Clean up graphics 2022-08-09 11:13:40 -04:00
GriffinR 1e02571269 Sync naming_screen 2022-08-08 12:05:30 -04:00
GriffinR 0e8b639fae Sync dbp - rename files 2022-08-07 13:55:50 -04:00
GriffinR 77e6f75509 Sync dbp - comm funcs 2022-08-07 13:47:22 -04:00
GriffinR bc62f128ab Sync dbp - function bodies 2022-08-07 13:28:05 -04:00
GriffinR 76adc777bf Sync dbp - struct members 2022-08-07 01:40:12 -04:00
GriffinR 25344d1bbd Merge pull request #530 from cbt6/sym-gitignore
Add symbol files to .gitignore
2022-08-07 01:13:24 -04:00
GriffinR 12fdf455ce Merge dodrio_berry_picking 1 and 2, sync function names 2022-08-06 20:40:11 -04:00
GriffinR d6d5290099 Merge pull request #527 from GriffinRichards/sync-more-save
Sync save sector checks
2022-08-06 18:22:56 -04:00
GriffinR 3fd7e08ae1 Merge pull request #529 from GriffinRichards/rename-viridian
Rename Viridian City houses
2022-08-06 12:53:54 -04:00
GriffinR bc5426a3c6 Merge pull request #528 from GriffinRichards/doc-behaviors
Document metatile behaviors
2022-08-06 02:45:30 -04:00
GriffinR 507b284353 Celadon water -> cycling road water 2022-08-06 02:31:19 -04:00
GriffinR daf293b9ab Rename Viridian City houses 2022-08-05 15:51:27 -04:00
GriffinR 1640f8b835 Document metatile behaviors 2022-08-05 15:27:08 -04:00
GriffinR f16b6100c8 Sync save sector checks 2022-08-05 11:49:17 -04:00
GriffinR 40cbfc0722 Merge pull request #526 from cbt6/save
Document src/save.c
2022-08-05 08:18:37 -04:00
GriffinR 49ea462d7f Merge pull request #525 from AsparagusEduardo/pokefirered_pokeemeraldSync2
2nd batch of syncing with pokeemerald
2022-08-01 16:56:48 -04:00
GriffinR f5c4a07d56 Merge pull request #524 from AsparagusEduardo/pokefirered_pokeemeraldSync
Sync with pokeemerald
2022-07-30 09:07:28 -04:00
GriffinR deec274991 Merge pull request #523 from cbt6/field-effect-helpers
Document src/field_effect_helpers.c
2022-07-26 11:06:45 -05:00
GriffinR 2e4534c593 Merge pull request #522 from cbt6/overworld
Document src/overworld.c
2022-07-16 18:18:48 -04:00
GriffinR d60f819e5c Merge pull request #521 from cbt6/field-effect-constants
Add field effect constants as comments
2022-07-13 07:53:36 -04:00
GriffinR fccd29fd2e Merge pull request #520 from cbt6/field-effect
Document src/field_effect.c
2022-07-12 18:24:31 -04:00
GriffinR d848452ffb Merge pull request #512 from GriffinRichards/header
Separate crt0, rom_header, and rom_header_gf
2022-07-05 11:43:30 -04:00
GriffinR 27e02b89b2 Merge pull request #519 from cbt6/field-message
Document src/field_message_box.c
2022-07-03 13:23:50 -04:00
GriffinR 724068dadf Merge pull request #516 from Kurausukun/bpm
Use Floats and Round Correctly in Tempo Calculation
2022-06-28 00:27:24 -04:00
GriffinR d1935aebb4 Merge branch 'master' of https://github.com/pret/pokefirered into header 2022-06-27 18:26:40 -04:00
GriffinR 56f7c919f4 Merge pull request #515 from GriffinRichards/addr-comm
Remove address comments
2022-06-27 18:24:17 -04:00
GriffinR 23e9d9d43c Merge pull request #513 from coltongit/patch-1
Remove dead prototypes
2022-06-24 21:28:51 -04:00
GriffinR 9cde4e0f74 Remove address comments 2022-06-24 21:10:48 -04:00
GriffinR d73f39ae40 Merge pull request #514 from LOuroboros/patch-1
Replaced undefined BUGFIX_SETMONIVS with good ol' BUGFIX
2022-06-24 20:47:55 -04:00
GriffinR 75c7e67f00 Fix Museum_1F -> PokemonCenter_1F text 2022-06-24 19:02:11 -04:00
GriffinR 2eb1c9664e Separate crt0, rom_header, and rom_header_gf 2022-06-21 20:16:20 -04:00
GriffinR c89af0d429 Merge pull request #511 from cbt6/field-transition
Document src/field_fadetransition.c
2022-06-21 12:25:41 -04:00
GriffinR f2b5d8000d Merge pull request #510 from Kurausukun/fix_constant
Fix Constant Usage
2022-06-19 21:46:47 -04:00
GriffinR 0ef7307040 Merge pull request #503 from colonelsalt/document_transform
Some documentation of transform types
2022-05-13 05:17:42 -04:00
GriffinR dca627c6bf Merge pull request #497 from GriffinRichards/update-build
Update Makefile to not require gcc-arm-none-eabi
2022-03-19 15:25:04 -04:00
GriffinR 4643644d7f Update Makefile to not require gcc-arm-none-eabi 2022-03-15 13:03:12 -04:00
GriffinR 3bdf9d7c65 Merge pull request #496 from GriffinRichards/sync-webhook
Add line breaks around webhook output
2022-03-14 15:26:26 -04:00
GriffinR f8aa4419fc Add line breaks around webhook output 2022-03-14 15:16:50 -04:00
GriffinR ac5274b8c2 Merge pull request #494 from PikalaxALT/replace-install
Sync INSTALL.md with Emerald
2022-03-14 09:58:54 -04:00
GriffinR b7a624077c Merge pull request #492 from GriffinRichards/sync-poke-jump
Sync pokemon jump
2022-03-05 12:28:07 -05:00
GriffinR 16aacb0648 Sync pokemon jump documentation 2022-03-02 02:05:07 -05:00
GriffinR 82f0cced2d Merge pokemon jump files 2022-03-01 17:53:05 -05:00
GriffinR fdfc8318c7 Merge pull request #491 from GriffinRichards/doc-anims
Document/sync object event anims
2022-03-01 09:51:09 -05:00
GriffinR cd9d40b3cd Add usage of ANIM_GET_ON_OFF_POKEMON_WEST, unused comments 2022-02-28 15:10:53 -05:00
GriffinR a5e6e91605 Document/sync object event anims 2022-02-28 13:17:57 -05:00
GriffinR 7cc59fbb11 Merge pull request #490 from cbt6/movement-action-0x9f
Rename movement action 0x9F
2022-02-28 10:41:16 -05:00
GriffinR 759f373d31 Merge pull request #488 from GriffinRichards/map-constants
Sync roamer.c, add missing map constant usage
2022-02-14 21:17:44 -05:00
GriffinR 8d85ff1683 Merge pull request #487 from GriffinRichards/trainer-type-constants
Add missing trainer type constant usage
2022-02-11 19:52:26 -05:00
GriffinR 59695b8221 Sync roamer 2022-02-11 15:05:15 -05:00
GriffinR 24f18af338 Add missing map constant usage 2022-02-11 14:43:38 -05:00
GriffinR 2598b285bb Add missing trainer type constant usage 2022-02-11 13:26:55 -05:00
GriffinR 91076d9408 Merge pull request #486 from Deokishisu/patch-4
Fix Magic Number in sub_8064544 in event_object_movement.c
2022-02-11 07:57:26 -05:00
GriffinR 9f2ac797d3 Merge pull request #485 from cbt6/movement
Rename some movement actions and functions
2022-02-09 13:07:59 -05:00
GriffinR bef2668d8b Merge pull request #481 from GriffinRichards/sync-classes
Sync/update trainer classes
2022-01-21 19:26:14 -05:00
GriffinR 7fb97f9e25 Merge pull request #483 from GriffinRichards/remove-berry-fix
Remove berry fix
2022-01-15 13:11:24 -05:00
GriffinR cf41c78370 Remove berry fix 2022-01-15 13:03:36 -05:00
GriffinR f8ab09b4b4 Merge pull request #482 from GriffinRichards/remove-old-asm-constants
Remove old asm constants
2022-01-11 02:20:18 -05:00
GriffinR 53eca1d3a7 Remove old asm constants 2022-01-10 19:39:09 -05:00
GriffinR 08a18d6e32 Sync/update trainer classes 2022-01-10 13:48:08 -05:00
GriffinR d0c79e4e47 Merge pull request #480 from GriffinRichards/map-preview-gfx
Clean up map preview graphics
2022-01-06 23:39:01 -05:00
GriffinR 2a59523ad9 Re-export map preview gfx with palettes and sensible sizes 2022-01-06 17:20:55 -05:00
GriffinR 26c496e099 Decompress map preview tilemaps 2022-01-06 15:34:55 -05:00
GriffinR f1121b1593 Move map preview gfx to own folders 2022-01-06 15:26:00 -05:00
GriffinR cb7b53adee Merge pull request #479 from Birdulon/PartySize
Fix party size calculations for larger-than-six PARTY_SIZE
2022-01-01 10:20:01 -05:00
GriffinR 4c023cb8c7 Merge pull request #478 from GriffinRichards/fix-baldingman
Fix balding man palette
2021-12-03 20:23:21 -05:00
GriffinR 0b61e91d6c Fix balding man palette 2021-12-03 19:54:36 -05:00
GriffinR 7b913802ab Merge pull request #477 from GriffinRichards/sync-global
Sync global
2021-11-28 15:50:13 -05:00
GriffinR 7e38583a5d Rotating Gate -> dir stair warp 2021-11-20 10:50:22 -05:00
GriffinR b2c74cae84 Sync global 2021-11-19 20:36:59 -05:00
GriffinR 6282f75cae Merge pull request #476 from Jademalo/patch-1
Add missing semicolon in charmap
2021-11-18 22:08:38 -05:00
GriffinR cd4462f58c Merge pull request #474 from lioniac/master
Multiple renamings and removed some orphaned functions
2021-11-01 15:25:22 -04:00
GriffinR 471608b56a Merge pull request #473 from Jademalo/ide-support
Improve IDE Support
2021-10-23 09:44:08 -04:00
GriffinR 6eaca5f0d0 Merge pull request #472 from lioniac/master
Few renamings based on Emerald
2021-10-18 14:47:44 -04:00
GriffinR 89b0351666 Merge pull request #471 from GriffinRichards/sync-calcrom
Make calcrom data info optional
2021-10-15 09:20:57 -04:00
GriffinR 434cc62b7c Make calcrom data info optional 2021-10-15 09:12:46 -04:00
GriffinR 7f123f4d0f Merge pull request #470 from GriffinRichards/fix-saveblockchunk
Disallow negative sizes in SAVEBLOCK_CHUNK
2021-10-13 13:43:58 -04:00
GriffinR 490300daab Disallow negative sizes in SAVEBLOCK_CHUNK 2021-10-13 13:29:17 -04:00
GriffinR 6eaeceb3ef Merge pull request #467 from GriffinRichards/sync-fieldmap
Sync fieldmap.c
2021-10-01 18:30:55 -04:00
GriffinR 1460774d1d Sync fieldmap.c 2021-10-01 17:56:14 -04:00
GriffinR 1f7eb7ea01 Merge pull request #466 from Deokishisu/master
Fix Magic Numbers in battle_anim_scripts.s
2021-10-01 00:26:48 -04:00
GriffinR fb1bca5b3e Merge pull request #464 from colonelsalt/documentation
Document fields in oak_speech
2021-09-26 22:46:10 -04:00
GriffinR b0698e27f9 Merge pull request #465 from SatoMew/master
Add fix to disallow negative current HP values
2021-09-14 13:27:28 -04:00
GriffinR 39c623c8cd Merge pull request #461 from Kurausukun/oops
oops
2021-08-21 07:49:17 -04:00
GriffinR 9ad143bf24 Merge pull request #460 from Sewef/master
Use SHINY_ODDS where necessary
2021-08-19 13:37:01 -04:00
GriffinR dbdd0d40f3 Fix symbols branch commit messages 2021-08-11 19:27:12 -04:00
GriffinR 073f315fc3 Merge pull request #458 from Squeetz/master
Rename and document HITMARKER_x100000
2021-08-11 12:21:26 -04:00
GriffinR feb5428937 Merge pull request #456 from SethBarberee/one_func_name
[New Game] Name single func
2021-08-01 12:15:35 -04:00
GriffinR 1150e16b68 Merge pull request #450 from PikalaxALT/flatten_sprite_pos
Flatten pos fields in struct Sprite
2021-07-25 12:51:51 -04:00