Commit Graph

2884 Commits

Author SHA1 Message Date
PikalaxALT
61a06dffe7 Address review comments 2020-04-10 10:57:20 -04:00
PikalaxALT
d79a499d91 Attempt to doc trade 2020-04-09 14:43:08 -04:00
PikalaxALT
8626240b54 Finish naming item_pc routines 2020-04-09 11:50:23 -04:00
PikalaxALT
a42e4134af Merge branch 'master' of github.com:pret/pokefirered into modern_gcc 2020-04-09 11:25:47 -04:00
PikalaxALT
a53ad6c565 Merge branch 'master' of github.com:pret/pokefirered into various_documentation 2020-04-09 10:22:21 -04:00
PikalaxALT
a81edaba1d
Merge pull request #327 from ultima-soul/documentation
Document Roamer Roar bug
2020-04-09 10:21:28 -04:00
ultima-soul
c79f1f1c80 Document Roamer Roar bug. 2020-04-08 20:13:38 -07:00
PikalaxALT
ea207f6334 Clean up includes 2020-04-08 17:03:26 -04:00
PikalaxALT
5f00cffaac Fix alignment 2020-04-08 15:42:41 -04:00
PikalaxALT
2073a56531 Finish naming objs in slot_machine 2020-04-08 12:51:31 -04:00
PikalaxALT
d7c165d8fe Start documenting slot machines 2020-04-08 08:55:39 -04:00
PikalaxALT
54559c2e08 More quest log documentation 2020-04-07 19:37:53 -04:00
PikalaxALT
eba370ac3b Merge branch 'master' into modern_gcc 2020-04-07 13:45:59 -04:00
PikalaxALT
a538befd55 Merge branch 'various_documentation' of github.com:PikalaxALT/pokefirered into various_documentation 2020-04-07 13:45:40 -04:00
PikalaxALT
6451143b3b Merge branch 'master' of github.com:pret/pokefirered into various_documentation 2020-04-07 13:45:25 -04:00
PikalaxALT
7f9e0ae6bf
Merge pull request #326 from PikalaxALT/match_atk7C
Match atk7C_trymirrormove
2020-04-07 13:25:09 -04:00
PikalaxALT
8a1c3b1362 Match atk7C_trymirrormove 2020-04-07 13:13:27 -04:00
PikalaxALT
fedb2f5c0b Merge branch 'master' of github.com:pret/pokefirered into modern_gcc 2020-04-07 11:05:48 -04:00
PikalaxALT
31ecdcdd0a Merge branch 'master' of github.com:pret/pokefirered into various_documentation 2020-04-07 07:50:06 -04:00
PikalaxALT
7693c90e67
Merge pull request #324 from GriffinRichards/move-gfx
Move gfx out of data
2020-04-06 20:51:18 -04:00
PikalaxALT
de9ae24766
Merge pull request #325 from GriffinRichards/fix-encounter
Fix tile encounter name
2020-04-06 20:50:52 -04:00
PikalaxALT
a7d74b1779 More quest log doccing 2020-04-06 20:43:53 -04:00
PikalaxALT
0394317ae4 Merge branch 'various_documentation' of github.com:PikalaxALT/pokefirered into various_documentation 2020-04-06 18:00:47 -04:00
PikalaxALT
c78101535b Split quest_log.c 2020-04-06 17:58:24 -04:00
PikalaxALT
c05ca373e0 Merge branch 'master' of github.com:pret/pokefirered into various_documentation 2020-04-06 15:27:10 -04:00
PikalaxALT
1f113498c9 Merge branch 'master' of github.com:pret/pokefirered into modern_gcc 2020-04-06 15:16:23 -04:00
PikalaxALT
b2e8e02364 Use actual filename/lineno in AGBAssert calls for modern 2020-04-06 15:13:47 -04:00
PikalaxALT
bbeef52a01 Timestamp modern build 2020-04-06 13:20:36 -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
PikalaxALT
6ecd9dd943
Merge pull request #318 from GriffinRichards/doc-rm
Document region map
2020-04-06 06:26:27 -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
PikalaxALT
a622448029 More quest log documentation amid other stuff 2020-04-05 20:30:45 -04:00
GriffinR
fabcbc16ec Document more region map 2020-04-05 17:30:31 -04:00
PikalaxALT
f15a705021 Resolve compile warnings in modern 2020-04-05 13:07:40 -04:00
PikalaxALT
585a1170c9 Partially unroll IWRAM clear loop 2020-04-05 08:36:10 -04:00
PikalaxALT
ca8580ddd9 Merge branch 'master' of github.com:pret/pokefirered into modern_gcc 2020-04-04 16:14:11 -04:00
PikalaxALT
35a578c620
Merge pull request #322 from PikalaxALT/travis_bump
Bump devkitARM to r52
2020-04-04 16:08:46 -04:00
PikalaxALT
143758d57b Travis: Get devkitarm-rules 2020-04-04 16:02:40 -04:00
PikalaxALT
80bb304365 Bump devkitARM to r52 2020-04-04 15:46:55 -04:00
PikalaxALT
f95b8e95a8 Add modern targets to .travis.yml 2020-04-04 15:38:35 -04:00
PikalaxALT
98c2df354f Fix alignment-related crashes 2020-04-04 15:09:22 -04:00
PikalaxALT
cc3419eff7 Get pokefirered_modern to build 2020-04-04 12:58:08 -04:00
PikalaxALT
feede54edd
Merge pull request #319 from garakmon/encounterinjafix
Fix encounter groups with neither a FireRed nor LeafGreen label
2020-04-04 12:54:16 -04:00
PikalaxALT
c47eca8a18
Merge pull request #316 from PikalaxALT/various_documentation
Various documentation
2020-04-03 19:25:01 -04:00
PikalaxALT
8f74dda3e4 Minor cleanup 2020-04-03 19:18:55 -04:00
garakmon
791e30c90b fix encounter groups with neither a FireRed or LeafGreen label 2020-04-03 15:04:49 -04:00