dionmoustos/Pokemon-Firered
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,229 Commits 1 Branch 0 Tags
ac3de6d02c5beda704570d6ada4ad2195770f819
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
GriffinR ea889b65ae Merge pull request #452 from Kurausukun/protectfix 
Port Protect Animation Fix from Emerald
 2021-07-13 00:42:44 -04:00
GriffinR 9648aad176 Use PR title for symbols branch commits 2021-07-08 11:25:58 -04:00
GriffinR 1a43cdc81f Merge pull request #449 from Kurausukun/align 
Remove Unnecessary .aligns
 2021-07-03 21:55:36 -04:00
GriffinR 585d92f298 Merge pull request #445 from Kurausukun/ubfix 
Port UBFIX Macro and Some Usages from Emerald
 2021-07-03 17:25:05 -04:00
GriffinR 558097f423 Merge pull request #441 from Kurausukun/cast_test 
Change itemPrintFunc to Use u32 Instead of s32
 2021-07-03 17:14:06 -04:00
GriffinR bbf39b8560 Merge pull request #442 from GriffinRichards/fix-offsets 
Remove hardcoded offsets in battle scripts
 2021-07-03 11:15:38 -04:00
GriffinR 552060c900 Merge pull request #448 from SnorlaxMonster/terrain 
Using macro for plain terrain instead of hardcoded numbers
 2021-07-03 09:38:56 -04:00
GriffinR 3927917784 Merge pull request #447 from Deokishisu/patch-2 
Fix Magic Number in party_menu.c
 2021-07-01 07:28:57 -04:00
GriffinR b564c1e58c Merge pull request #446 from garakmon/hey 
fix encounter slot logic to accomodate changes
 2021-06-27 21:41:20 -04:00
GriffinR 5bf794f051 Remove hardcoded offsets in battle scripts 2021-06-21 16:02:13 -04:00
GriffinR 2d3210dc11 Merge pull request #438 from PikalaxALT/doc_tileset_anims 
Doc tileset anims
 2021-06-03 16:35:03 -04:00
GriffinR 83cdfb52f7 Merge pull request #437 from Deokishisu/linkplayer-sync 
Sync LinkPlayer Struct with pokeemerald
 2021-06-03 14:40:55 -04:00
GriffinR 753b19d0ea Merge pull request #435 from Kurausukun/dumb 
[LEAK-INFORMED] Fix CreateShedinja Fakematch
 2021-06-02 16:38:03 -04:00
GriffinR 89ce873a73 Merge pull request #436 from PikalaxALT/sync_link_rfu 
Sync link rfu from Emerald
 2021-06-02 16:33:18 -04:00
GriffinR c396aaa804 Merge pull request #431 from PikalaxALT/sync_bery_crush 
Sync berry crush from Emerald
 2021-05-27 06:46:29 -04:00
GriffinR 7deccc36b7 Name unused house maps/map groups 2021-05-13 12:51:45 -04:00
GriffinR 0ccdd940f7 Merge pull request #429 from PikalaxALT/doc_field_effect_templates 
Document field effect graphics
 2021-05-11 16:05:04 -04:00
GriffinR 4767019e4f Merge pull request #432 from PikalaxALT/fix_list_menu 
Replace unknown list struct
 2021-05-08 11:21:09 -04:00
GriffinR 608194c53d Merge pull request #433 from PikalaxALT/move_desc_to_c 
Finish porting data_8479668.s to C
 2021-05-08 11:20:06 -04:00
GriffinR f4130c5932 Merge pull request #428 from PikalaxALT/trainer_tower_to_c 
Trainer tower sets to C
 2021-05-07 14:11:38 -04:00
GriffinR 75f2be2e29 Name map groups 2021-04-28 16:37:08 -04:00
GriffinR 9ed87063f1 Merge pull request #424 from PikalaxALT/doc_fame_checker 
Improve fame_checker.c documentation
 2021-04-27 16:28:08 -04:00
GriffinR 983ab81dfd Merge pull request #425 from PikalaxALT/sync_task 
Sync task.c from Emerald
 2021-04-27 15:57:31 -04:00
GriffinR d21090cf04 Merge pull request #406 from hjk321/index-graphics 
Document, Index, and Prettify Graphics, Part 1 (A-H)
 2021-04-23 14:01:11 -04:00
GriffinR dbf3de7755 Merge pull request #423 from PikalaxALT/doc_pokedex_screen 
Document Pokedex Screen
 2021-04-21 15:18:26 -04:00
GriffinR cf553c7006 Merge pull request #422 from Kurausukun/final 
Fix Final 2 Nonmatchings (ported from emerald)
 2021-04-21 08:49:55 -04:00
GriffinR 03fb7d24e8 Merge pull request #420 from Sewef/patch-1 
Add missing char in charmap
 2021-04-20 19:20:21 -04:00
GriffinR a005118d7f Merge pull request #419 from Kurausukun/M4A_IS_DEAD 
FIX CGBMODVOL FAKEMATCHING (WE DID IT REDDIT)
 2021-04-20 00:14:20 -04:00
GriffinR 918ed2d31e Merge pull request #417 from SatoMew/master 
Replace rival labels
 2021-04-18 18:23:00 -04:00
GriffinR 9392ba8ab1 Merge pull request #416 from GriffinRichards/fix-party 
Fix empty trainer party initializer
 2021-04-18 18:21:34 -04:00
GriffinR 9ced234e4b Merge pull request #410 from PikalaxALT/doc_pokesum 
Document Pokemon Summary Screen
 2021-04-18 18:13:32 -04:00
GriffinR 851807f7ac Fix empty trainer party initializer 2021-04-14 16:10:37 -04:00
GriffinR b54bd2e387 Merge pull request #414 from SatoMew/record-corner 
Fix Record Corner labels
 2021-04-10 13:59:31 -04:00
GriffinR 37634072b1 Merge pull request #413 from Kurausukun/graey 
Standardize Spelling of "Gray"
 2021-04-09 23:04:52 -04:00
GriffinR 0ecc1876a9 Merge pull request #408 from PikalaxALT/fix_mvmt_types 
Doc VS Seeker; fix misnamed movement types
 2021-04-01 23:15:01 -04:00
GriffinR d1afbf17bb Merge pull request #407 from PikalaxALT/doc_bike 
Document bike.c and fix weird goto
 2021-03-30 16:14:01 -04:00
GriffinR 35b68c68ee Merge pull request #404 from PikalaxALT/misc_doc 
[PARTIALLY LEAK INFORMED] Miscellaneous cleanup and documentation
 2021-03-24 23:19:48 -04:00
GriffinR d8b76e6fb5 Merge pull request #405 from Kurausukun/port_matchings 
[PARTIALLY LEAK-INFORMED] Port Matchings from Emerald and Fix Other Nonmatchings
 2021-03-23 22:06:08 -04:00
GriffinR ed16a7409a Merge pull request #403 from PikalaxALT/battle_multi_buffer 
Battle documentation (14032021)
 2021-03-18 15:25:46 -04:00
GriffinR 077faeb1bd Use global symbols for assembly on modern 2021-03-14 19:13:23 -04:00
GriffinR e1f76f1689 Merge pull request #401 from SethBarberee/emerald_backport_1 
Backport 2 nonmatching fixes from emerald
 2021-03-13 16:53:10 -05:00
GriffinR 4d1e074514 Fix Son/Daughter name swap 2021-03-12 12:47:51 -05:00
GriffinR 1c03a923b7 Merge pull request #399 from Deokishisu/patch-1000 
Fix Typos / Use Box Constants / Name an Unknown
 2021-03-11 15:11:53 -05:00
GriffinR 651b59d631 Update calcrom ignore path 2021-03-10 18:11:47 -05:00
GriffinR 28e3522acb Use NONMATCHING on modern for gcc-arm-none-eabi 2021-03-10 17:55:46 -05:00
GriffinR bf6e80850c Sync Berry Fix makefiles with pokeemerald 2021-03-10 17:19:11 -05:00
GriffinR b2f0efc6f7 Replace Travis CI with Github workflow 2021-03-10 16:45:38 -05:00
GriffinR 42b93f8359 Merge pull request #398 from SethBarberee/patch-1 
Add -DINFO Option to Makefile
 2021-03-03 19:56:49 -05:00
GriffinR 12c7dab219 Merge pull request #396 from hjk321/storage-magic 
Change embarassing magic numbers that should have been fixed a long time ago
 2021-02-22 11:26:52 -05:00
GriffinR 5351028d7e Merge pull request #394 from GriffinRichards/calcrom100 
Celebratory change to calcrom.pl
 2021-02-19 20:35:04 -05:00
GriffinR 003d6b95d9 Celebratory change to calcrom.pl 2021-02-19 20:09:01 -05:00
GriffinR b4c5559613 Merge pull request #393 from Kurausukun/text_printer 
[LEAK-INFORMED] match rest of text_printer
 2021-02-19 19:44:11 -05:00
GriffinR 33126a0633 Merge pull request #392 from Deokishisu/ExternalEvents-doc 
Mirror pokeemerald PR#1329 & PR#1335 to pokefirered
 2021-02-16 17:55:56 -05:00
GriffinR bc4f88d72c Merge pull request #391 from Deokishisu/movement_type-rename 
Rename "Hidden" Movement Type to "Buried"
 2021-02-14 21:48:36 -05:00
GriffinR 8c66bde715 Merge pull request #388 from GriffinRichards/constants-localids 
Use more LOCALID constants
 2021-02-14 14:07:32 -05:00
GriffinR b422fd4a49 Merge pull request #389 from Kurausukun/dexmatching 
[LEAK-INFORMED] match the rest of pokedex_screen
 2021-02-14 11:18:46 -05:00
GriffinR 43033ec97c Merge pull request #390 from GriffinRichards/fix-constwarning 
Fix warning about gMonPaletteTable section
 2021-02-12 19:17:24 -05:00
GriffinR 1b84bd395d Fix warning about gMonPaletteTable section 2021-02-12 17:18:14 -05:00
GriffinR 515dde69af Use more LOCALID constants 2021-02-10 20:20:15 -05:00
GriffinR a34c9d09b6 Merge pull request #385 from Deokishisu/patch-3 
Fix Trainer Tower Magic Number
 2021-02-09 13:13:52 -05:00
GriffinR efba18bb0b Merge pull request #384 from Deokishisu/patch-2 
Fix "Compatibility" Misspelling
 2021-02-05 07:18:01 -05:00
GriffinR 8a0294f9f1 Merge pull request #383 from Deokishisu/patch-2 
Fix Vermilion Gym Script Label Transposition Typos
 2021-02-03 20:49:41 -05:00
GriffinR 80b2c0eee6 Merge pull request #382 from GriffinRichards/relativeconstants 
Use trainer constants in flags, automatically update flags/vars count
 2021-02-01 14:57:18 -05:00
GriffinR 1f6dc0e86b Use trainer constants in flags, automatically update flags/vars count 2021-01-29 15:50:01 -05:00
GriffinR 419c897292 Merge pull request #380 from GriffinRichards/sync-scaninc 
Sync tools with pokeemerald
 2021-01-19 02:17:21 -05:00