dionmoustos/Pokemon-Firered
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,151 Commits 1 Branch 0 Tags
ee0f35b8663acc5c1e1eb28074ad5917783afd17
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
GriffinR a52d6e4379 Fix modern ld_script 2021-01-19 02:06:27 -05:00
GriffinR 9d20f55a58 Move 'source' asm files to src 2021-01-19 01:54:14 -05:00
GriffinR 9350e2d338 Sync mapjson with pokeemerald 2021-01-19 01:38:15 -05:00
GriffinR 393a6bd5b6 Sync gbagfx with pokeemerald 2021-01-19 01:28:49 -05:00
GriffinR 538c1d0efd Sync preproc with pokeemerald 2021-01-19 01:19:32 -05:00
GriffinR 8e8677f1e4 Update Makefile for scaninc 2021-01-19 01:19:19 -05:00
GriffinR cd67c5e240 Sync scaninc with pokeemerald 2021-01-18 23:39:05 -05:00
GriffinR ac62e8e563 Merge pull request #377 from Deokishisu/master 
Fix Egregious Magic Numbers in GetBattleBGM
 2021-01-08 08:11:13 -05:00
GriffinR 135fd3948a Merge pull request #376 from SatoMew/master 
Document the unused battle strings for downpour and rain weather
 2021-01-07 00:35:31 -05:00
GriffinR 22cd65bd55 Merge pull request #375 from GriffinRichards/deadname 
Remove deadnaming, sync BgEvent
 2020-12-31 14:36:01 -05:00
GriffinR 9509797b98 Remove deadnaming, sync BgEvent 2020-12-31 14:24:30 -05:00
GriffinR 2183626229 Merge pull request #374 from Deokishisu/patch-1 
Fix Missed Magic Numbers in main_menu.c
 2020-12-31 12:40:31 -05:00
GriffinR f8a1bf14fb Merge pull request #371 from GriffinRichards/data-pokedex 
Move pokedex_screen data from asm to C
 2020-11-27 11:12:05 -05:00
GriffinR 7377bc438b Merge pull request #373 from V-FEXrt/farfetchd 
Rename farfetchd graphics to match define
 2020-11-27 10:57:55 -05:00
GriffinR 46a9525534 Merge pull request #372 from V-FEXrt/trainer_parties_variables 
Rename unknown trainer party variables
 2020-11-15 20:15:12 -05:00
GriffinR f2e7684b17 Fix modern build 2020-11-12 00:53:57 -05:00
GriffinR 1d820d4e0f Clean up pokedex screen text 2020-11-12 00:06:22 -05:00
GriffinR 66e9059578 Move pokedex_screen data from asm to C 2020-11-11 23:44:30 -05:00
GriffinR 2062659541 Merge pull request #370 from V-FEXrt/pokedex-screen 
Give meaningful names to globals in pokedex_screen.s
 2020-11-11 17:53:11 -05:00
GriffinR 8669fe0f95 Merge pull request #368 from Kurausukun/match_m4a 
Match FadeOutBody (ported from pokeemerald)
 2020-11-02 11:48:06 -05:00
GriffinR 7b8c935926 Merge pull request #365 from GriffinRichards/moves-const 
Fix hang when releasing after adding new moves
 2020-10-11 16:26:00 -04:00
GriffinR 0f21fc13ef Fix hang when releasing after adding new moves 2020-10-11 16:10:03 -04:00
GriffinR f9ce82fd74 Merge pull request #364 from Kurausukun/audio_macros 
Update Audio Macros
 2020-09-28 08:04:10 -04:00
GriffinR 9cb570dc1b Merge pull request #362 from Kurausukun/rename_instruments 
rename instruments (again)
 2020-09-23 23:40:22 -04:00
GriffinR 6c5a10767f Merge pull request #360 from BigBahss/leafgreen-encounters-prefix 
wild_encounters.json: Add "MAP_" prefix to LeafGreen's "map" fields
 2020-09-07 04:58:51 -04:00
GriffinR 74d71e72b5 Merge pull request #358 from Tianmaru/master 
renamed title screen sprites
 2020-09-02 18:47:59 -04:00
GriffinR 83806d0f95 Merge pull request #353 from PokeCodec/MatchFirered 
Match (Most of) Firered
 2020-09-01 13:31:39 -04:00
GriffinR 4ac1b3fec5 Merge pull request #357 from GriffinRichards/fix-typo 
Fix Fuchsica typo
 2020-08-31 21:50:54 -04:00
GriffinR b7a88180d3 Fix Fuchsica typo 2020-08-31 21:37:59 -04:00
GriffinR 4cf0957795 Merge pull request #356 from GriffinRichards/rename-songs 
Give songs meaningful english names
 2020-08-31 13:42:41 -04:00
GriffinR bb56d4a3f4 Give songs meaningful english names 2020-08-29 03:11:03 -04:00
GriffinR c5839905a1 Merge pull request #354 from GriffinRichards/add-nonmatch 
Wrap asm statements in NONMATCHING
 2020-08-25 03:20:53 -04:00
GriffinR d8f858d04e Wrap asm statements in NONMATCHING 2020-08-18 09:09:25 -04:00
GriffinR e055d3afa4 Add MAX_MAP_DATA_SIZE alias 2020-05-17 16:45:58 -04:00
GriffinR 7b18204a90 Merge branch 'master' into doc-inconnect 2020-05-14 19:27:02 -04:00
GriffinR 992fba2bc5 Fix nonmatching build 2020-05-14 19:14:34 -04:00
GriffinR ea01b132b2 Label in_connection's field in ObjectEventTemplate 2020-05-14 16:29:19 -04:00
GriffinR d6a494551a Fix corresponding mislabeled rival script 2020-05-04 14:45:07 -04:00
GriffinR 5bd2c0ef5c Fix mislabeled starter script 2020-05-04 14:34:45 -04:00
GriffinR cdc705f7e3 Label GCN link flags field 2020-04-22 23:30:44 +10:00