Commit Graph

2861 Commits

Author SHA1 Message Date
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
PikalaxALT 0816046a73 Merge pull request #346 from luckytyphlosion/master
Match (almost) all of pokemon_summary_screen.c
2020-07-08 16:01:56 -04:00
luckytyphlosion 4672e05560 Fix sub_8137C18 nonmatching. 2020-07-08 15:41:54 -04:00
luckytyphlosion 71d26549e6 Remove cgrep.sh and hgrep.sh
Will be added in another PR.
2020-07-08 15:40:04 -04:00
luckytyphlosion 8a323538cf Forgot to add some excludes to grep shell scripts. 2020-07-04 21:23:57 -04:00
luckytyphlosion 5df6d9f940 Get rid of readelf.py
Maybe I'll touch it up and submit it in another PR.
2020-07-04 20:56:40 -04:00
luckytyphlosion ed4a703838 Apply static modifier to static functions in PSS. 2020-07-04 20:54:24 -04:00
luckytyphlosion 1bea05746e Fix prefixes of static variables in PSS. 2020-07-04 20:46:19 -04:00
luckytyphlosion c4d7037f49 Declare some data as static. 2020-07-04 20:38:04 -04:00
luckytyphlosion 1ad6f5270c Port over PSS data to src. 2020-07-04 20:32:44 -04:00
luckytyphlosion d7df6bf6e3 Get rid of manual sym defines in sym_ewram.txt and ld_script_modern.txt 2020-07-04 18:14:40 -04:00
luckytyphlosion aecf2dbf6e pokemon_summary_screen.c, part 13. 2020-07-04 17:15:04 -04:00
luckytyphlosion db2fb7785d pokemon_summary_screen.c, part 12. 2020-07-04 16:07:40 -04:00
luckytyphlosion 4bf7e4f4fb pokemon_summary_screen.c, part 11. 2020-07-03 21:35:59 -04:00
luckytyphlosion 7cb48a704a pokemon_summary_screen.c, part 10. 2020-07-03 19:40:10 -04:00
luckytyphlosion f8247cdd79 pokemon_summary_screen.c, part 9. 2020-07-03 17:42:40 -04:00