ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 20:47:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,328 Commits 1 Branch 0 Tags 235 MiB
846b5d79e4
Commit Graph

3328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
846b5d79e4 Get rid of headers in src/data 2018-12-03 16:10:41 +01:00
DizzyEggg
a83fc52a7e Make data easier to edit 2018-12-03 14:49:16 +01:00
DizzyEggg
d8b952f94c Clean up items data 2018-12-03 13:37:32 +01: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
DizzyEggg
7cfe0342f0 Finish frontier data 2018-11-27 22:45:50 +01:00
Diegoisawesome
2e2cd59160
Merge pull request #404 from garakmon/frontier-data 
Some frontier data
 2018-11-27 12:58:31 -06:00
garak
f316d53c58 Merge branch 'frontier-data' of https://github.com/garakmon/pokeemerald into frontier-data 2018-11-27 13:28:44 -05:00
garak
2707bd9b91 clean frontier data 2018-11-27 13:27:49 -05:00
garak
a636005066
delete createsprite.py 2018-11-27 11:40:29 -05:00
garak
73cce79753 Merge remote-tracking branch 'upstream/master' into frontier-data 2018-11-27 11:35:19 -05:00
garak
091b5194e7 frontier pike and pyramid data 2018-11-27 11:21:48 -05:00
Diegoisawesome
c909aa92de
Merge pull request #403 from nullableVoidPtr/master 
Clean up aligned variables in src/
 2018-11-27 10:11:29 -06:00
nullableVoidPtr
556bdd52e1 Clean up aligned variables in src/ 2018-11-27 19:37:29 +08:00
Diegoisawesome
977e0bc345
Merge pull request #402 from Slawter666/pokedex-data 
Convert pokédex data to C
 2018-11-27 03:18:28 -06:00
Slawter666
deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Marcus Huderle
382ff45452
Merge pull request #396 from DizzyEggg/attempt 
Match some functions
 2018-11-26 16:58:19 -06:00
Marcus Huderle
c233dbb220
Merge pull request #400 from DizzyEggg/util 
Match sub_080F8970
 2018-11-26 16:57:36 -06:00
Marcus Huderle
65622d34cd
Merge pull request #401 from PlatinumMaster/patch-1 
Fix labels, shifted off by one.
 2018-11-26 16:57:22 -06:00