Commit Graph
100 Commits
Author SHA1 Message Date
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
GriffinR 03ca7d8bb4 Label GCN link flags field 2020-04-13 08:42:56 -04:00
GriffinR 662c8db99e Fix tile encounter name 2020-04-06 12:53:53 -04:00
GriffinR 1536737da4 Fix some static labels 2020-04-06 10:51:07 -04:00
GriffinR f3919ab5c3 Drop missed prefixes 2020-04-06 10:10:12 -04:00
GriffinR 100188ac43 Move gfx out of data 2020-04-06 10:02:14 -04:00
GriffinR 93d17ef7c8 Merge branch 'master' into doc-rm 2020-04-06 00:37:08 -04:00
GriffinR 5f1a4de374 Clean up region map doc 2020-04-06 00:35:20 -04:00
GriffinR fabcbc16ec Document more region map 2020-04-05 17:30:31 -04:00
GriffinR 250f955ae6 Start documenting region map 2020-04-01 17:32:22 -04:00
GriffinR 55f9028383 Reorient object event sprites to horizontal 2020-03-29 11:48:01 -04:00
GriffinR eebe7f2233 Use trainer type constants 2020-03-27 10:21:26 -04:00
GriffinR e68c165d71 Label oam tables 2020-03-27 09:14:26 -04:00
GriffinR 73503e3e4d Use directional movement action constants 2020-03-26 13:54:42 -04:00
GriffinR 6cf4bc4101 Label object event graphics 2020-03-26 13:39:40 -04:00
GriffinR 89c4e3229e Review static evobjmv data 2020-03-25 03:22:12 -04:00
GriffinR f6d0a14e7f Move remaining event_object_movement data to src 2020-03-25 01:21:31 -04:00
GriffinR 0da7681d8f Move object event graphics to src 2020-03-25 01:14:16 -04:00
GriffinR 5b612393eb Move data up to object event graphics to src 2020-03-25 00:57:23 -04:00
GriffinR 970717ee2c Move object event graphics info pointers to src 2020-03-25 00:46:27 -04:00
GriffinR d50ce48776 Move field effect object template pointers to src 2020-03-24 20:36:52 -04:00
GriffinR 936529b3cb Move object event pic tables to src 2020-03-24 20:31:12 -04:00
GriffinR 8214c6a91f Move object event anims to src 2020-03-24 18:49:38 -04:00
GriffinR db50454973 Move base oam to src 2020-03-24 18:16:41 -04:00
GriffinR badb380861 Move object event subsprites to src 2020-03-24 17:24:29 -04:00
GriffinR 5d0ababb58 Move object event graphics info to src 2020-03-24 16:58:47 -04:00
GriffinR 671a5d3273 Move palette tags to src 2020-03-24 14:44:21 -04:00
GriffinR b021ce35b7 Move field effect objects to src 2020-03-24 14:16:49 -04:00
GriffinR 68e942065a Move movement type func tables to src 2020-03-23 22:42:36 -04:00
GriffinR b607821bf6 Move evobjmv data up to movement type func tables to src 2020-03-23 17:34:12 -04:00
GriffinR b76d8f569c Move movement action func tables to src 2020-03-23 16:39:46 -04:00
GriffinR 9c1a8011d9 Move heal location data 2020-03-19 19:32:13 -04:00
GriffinR 98942449be Standardize tileset folder names 2020-03-16 20:52:12 -04:00
GriffinR ebf2f04d91 Label used metatile attributes 2020-03-16 19:09:13 -04:00
GriffinR 090591b71d Remove unnecessary border tile macro 2020-03-15 11:29:12 -04:00