Commit Graph

2976 Commits

Author SHA1 Message Date
Deokishisu 90e5a5ff7e Fix Egregious Magic Numbers in GetBattleBGM
Whoever originally decomped this function must've been really fed up with this file.

Renamed GetMUS_ForBattle to GetBattleBGM to be consistent with pokeemerald.

This entire function was magic numbers, so I replaced them with the appropriate constants.
2021-01-08 04:09:59 -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
SatoMew e5d0a4f35c Document the unused battle strings for downpour and rain weather 2021-01-01 14:38:25 +00: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
Deokishisu 6e77eef0cd Fix Missed Magic Numbers in main_menu.c
There were two lines where magic numbers were used instead of the constant for MAIN_MENU_WINDOW_ERROR, so I filled them in.
2020-12-31 11:36:27 -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
Ashley Coleman 06b6853fb8 Rename farfetchd graphics to match define 2020-11-26 11:26:05 -08: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
Ashley Coleman 83fe4e5dd8 Rename unknown trainer party variables 2020-11-12 21:06:49 -08: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
Ashley Coleman 8485cec283 Merge pull request #1 from pret/master
Sync upstream
2020-11-11 15:46:56 -08: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
Ashley Coleman 2745ac3445 Give meaningfull names to globals in pokedex_screen.s 2020-11-11 13:40:18 -08:00
GriffinR 8669fe0f95 Merge pull request #368 from Kurausukun/match_m4a
Match FadeOutBody (ported from pokeemerald)
2020-11-02 11:48:06 -05:00
Kurausukun feb10af9f8 Match FadeOutBody (ported from pokeemerald) 2020-11-01 23:35:10 -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
Kurausukun 86445c2131 update audio macros 2020-09-27 22:38:52 -04:00
GriffinR 9cb570dc1b Merge pull request #362 from Kurausukun/rename_instruments
rename instruments (again)
2020-09-23 23:40:22 -04:00
Kurausukun 4df870b7dc rename instruments (again)
Mirroring the change made in pokeemerald
2020-09-23 22:35:00 -04:00
PikalaxALT 03f516bce3 Merge pull request #361 from PikalaxALT/match_naked
Match sub_8159AB8
2020-09-08 16:07:59 -04:00
PikalaxALT 6170072017 Resolve travis config warnings 2020-09-08 15:41:09 -04:00
PikalaxALT a0fbb82a7c Match sub_8159AB8 2020-09-08 15:00:41 -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
BigBahss abc2915eb0 Add "MAP_" prefix missing from 76e126a35b 2020-09-06 23:51:51 -04:00
BigBahss 76e126a35b Add "MAP_" prefix to LeafGreen "map" fields 2020-09-06 22:56:49 -04:00
PikalaxALT c040ec2475 Merge pull request #359 from PikalaxALT/agb_flash_fix
Fix agb_flash in modern frlg
2020-09-03 16:07:52 -04:00
PikalaxALT ecc3da6e2f Fix agb_flash in modern frlg 2020-09-03 15:55:52 -04:00
GriffinR 74d71e72b5 Merge pull request #358 from Tianmaru/master
renamed title screen sprites
2020-09-02 18:47:59 -04:00
tianmaru 22811953d8 update make rules for graphics 2020-09-03 00:36:59 +02:00
tianmaru 1b5d054e0b fix wrong file names 2020-09-02 23:04:54 +02:00
tianmaru 7042c996c4 renamed title screen sprites 2020-09-02 22:25:39 +02:00
GriffinR 83806d0f95 Merge pull request #353 from PokeCodec/MatchFirered
Match (Most of) Firered
2020-09-01 13:31:39 -04:00
PokeCodec 26ac9c5faf Match Most of Remaining Functions 2020-09-01 11:42:28 -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
PikalaxALT 2455913e39 Merge pull request #350 from PokeCodec/matchingtransition
Match sub_80D1F64
2020-08-17 16:34:43 -04:00
PokeCodec e1848ef54d Match sub_80D1F64 2020-08-17 14:23:41 -04:00
PikalaxALT ea10b25fb1 Merge pull request #347 from pret/map-preview-bugfix
Bugfix for access violation in MapPreview_CreateMapNameWindow
2020-07-10 19:55:18 -04:00
PikalaxALT 7b2d1082cc Bugfix for access violation in MapPreview_CreateMapNameWindow 2020-07-10 19:41:44 -04:00