Commit Graph

3342 Commits

Author SHA1 Message Date
DizzyEggg ba1fc05558 tabs 2018-12-03 18:10:03 +01:00
DizzyEggg 0d122bc831 Fix merge conflicts 2018-12-03 17:56:36 +01:00
Diegoisawesome ffa8655f4c
Merge pull request #423 from Slawter666/pokedex-doc
Document some of pokedex.c
2018-12-03 10:53:21 -06:00
Diegoisawesome cd378ec676
Merge pull request #421 from melthelesbian/trainer_class_lookups
clean up trainer class lookups
2018-12-03 10:52:24 -06:00
DizzyEggg e1829c40ab Clean up safari zone 2018-12-03 17:31:34 +01:00
DizzyEggg 2821eafb99 Clean up roamer 2018-12-03 17:19:10 +01:00
DizzyEggg dcb1d78fa9 Add battle controllers var to src from sym_ewram 2018-12-03 16:20:39 +01:00
DizzyEggg 846b5d79e4 Get rid of headers in src/data 2018-12-03 16:10:41 +01:00
Slawter666 715fbb379e Document some of pokedex.c 2018-12-03 14:58:25 +00:00
DizzyEggg a83fc52a7e Make data easier to edit 2018-12-03 14:49:16 +01:00
Melody 44af811033 index trainer front anims ptr table 2018-12-03 08:36:10 -05:00
Melody 0e5e487b78 tweak alignment 2018-12-03 08:04:11 -05:00
Melody 2779421ad4 fix brendan/may/wally consistency issues 2018-12-03 08:01:52 -05:00
DizzyEggg d8b952f94c Clean up items data 2018-12-03 13:37:32 +01:00
Melody 52fa5137c9 tweak alignment 2018-12-03 00:31:15 -05:00
Melody eeb6446da4 add more consistent names 2018-12-02 22:36:09 -05:00
Melody 72bd670ba6 index trainer class lookups 2018-12-02 22:35:31 -05:00
Diegoisawesome 7914220acd
Merge pull request #419 from melthelesbian/trainerbattle_macro_cleanup
cleans up trainer battle scripts
2018-12-02 14:31:19 -06:00
Melody a2a99bde11 adds req for macro arguments 2018-12-02 15:14:29 -05:00
Melody 10725def8e trainerbattle_normal → trainerbattle_single
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
2018-12-02 15:08:19 -05:00
Melody bad5323642 cleans up trainer battle scripts
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
2018-12-02 15:08:19 -05:00
Diegoisawesome 2912ec0e37
Merge pull request #420 from DizzyEggg/bored
Get rid of static functions in includ and add req macro arguments
2018-12-02 14:05:35 -06:00
DizzyEggg 9828e0e97b Merge with master 2018-12-02 19:38:05 +01:00
Diegoisawesome c123b8d6f1
Merge pull request #417 from melthelesbian/msgbox_documentation
adds constants, cleans up callstd and msgbox code
2018-12-02 12:31:54 -06:00
Diegoisawesome ee05197eba
Merge pull request #418 from DizzyEggg/link_rfu
Finish Link rfu
2018-12-02 12:29:31 -06:00
DizzyEggg a42bfd7a0e fix brackes n ne file 2018-12-02 19:27:56 +01:00
DizzyEggg 725f99a1bf Use :req macros 2018-12-02 19:24:06 +01:00
DizzyEggg b87e6a4e57 Get rid of static functions in includes 2018-12-02 18:58:33 +01:00
DizzyEggg d137ebc7a9 Some more rom 8011dc0 work 2018-12-02 13:59:55 +01:00
Melody 862265b73a defines `register_matchcall` macro 2018-12-02 06:04:59 -05:00
DizzyEggg e17140536a finish link rfu and fix rom 8011dc0 2018-12-02 11:58:50 +01:00
Melody c557ac61ae adds constants, cleans up callstd and msgbox code
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
2018-12-02 03:37:46 -05:00
Diegoisawesome 145047d438
Merge pull request #416 from melthelesbian/fix_pokefan
fixes pokefan graphics naming
2018-12-02 00:02:43 -06:00
Melody b9cf4f27b5 renames the winstrate graphics names to pokefan 2018-12-02 00:47:04 -05:00
Diegoisawesome a2186dcdd7
Merge pull request #415 from melthelesbian/trainer_defs
cleans up trainer name defines
2018-12-01 22:44:17 -06:00
Melody c7f52c4203 cleans up trainer name defines 2018-12-01 22:49:33 -05:00
DizzyEggg b082f000af Start working on link rfu 2018-12-01 18:54:59 +01:00
Marcus Huderle 0e32a3adf3
Decompile normal.c (#414) 2018-11-30 17:29:55 -06:00
Diegoisawesome 8e24a49b78
Merge pull request #413 from DizzyEggg/do
Match 2 field effect functions
2018-11-30 17:17:20 -06:00
DizzyEggg 0ad4795e69 Match 2 field effect functions 2018-11-30 23:16:15 +01:00
Marcus Huderle 9dd7f8f214
Decompile pokedex_area_screen.c (#412) 2018-11-30 10:41:03 -06:00
Diegoisawesome 275ce5deff
Merge pull request #410 from DizzyEggg/will_i_match_sth_again
match 2 field functions
2018-11-29 17:46:30 -06:00
DizzyEggg f87e68379c match 2 field functions 2018-11-29 21:19:00 +01:00
Diegoisawesome a7a317f6cc
Merge pull request #408 from DizzyEggg/pass_time
Match 3 link rfu functions
2018-11-28 16:51:53 -06:00
DizzyEggg f54f5b3531 Match 3 link rfu functions 2018-11-28 23:08:20 +01:00
Diegoisawesome 4a9b4ba0b3
Merge pull request #407 from DizzyEggg/max_sprites
Use MAX_SPRITES define
2018-11-28 14:34:11 -06:00
DizzyEggg 0ed2f54d61 Use MAX_SPRITES define 2018-11-28 21:08:22 +01:00
Marcus Huderle 0148e38973
Decompile pokedex_cry_screen.c (#406) 2018-11-28 10:14:32 -06:00
Marcus Huderle 9fafa63743 Finish decompiling internation_string_util.c 2018-11-27 17:21:23 -06:00
Diegoisawesome 0cdd1cc1da
Merge pull request #405 from DizzyEggg/frontier_data
Finish frontier data
2018-11-27 16:48:11 -06:00