ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,765 Commits 1 Branch 0 Tags 235 MiB
698c2879e4
Commit Graph

1795 Commits

Author SHA1 Message Date
Diegoisawesome
2bca45bcf5 More link stuff, stumped on sub_807A728 2018-12-24 14:39:05 -06:00
Marcus Huderle
c2fdbb0ef7 Decompile psychic.c 2018-12-24 10:52:56 -06:00
Marcus Huderle
f1213ebb4b Decompile dark.c 2018-12-24 09:55:00 -06:00
Diegoisawesome
3f08e0c76c Some more trade nonsense 2018-12-24 03:03:02 -06:00
Diegoisawesome
81b38c00e4
Merge pull request #466 from melthelesbian/compare_macros 
improve compare macros
 2018-12-23 11:17:30 -06:00
Diegoisawesome
a5c09bfec6 S'more trade 2018-12-23 01:26:38 -06:00
Diegoisawesome
ebbe826133
Merge pull request #437 from DizzyEggg/storage 
Pokemon Storage System
 2018-12-22 16:12:27 -06:00
DizzyEggg
c805bab483 Storage - review changes 2018-12-22 23:00:22 +01:00
Diegoisawesome
a39783a637 More trade.c 2018-12-22 01:26:53 -06:00
Melody
55005f1588 improve call_if macros 2018-12-21 21:32:45 -05:00
Melody
ac2e4adf2d improve goto_if macros 2018-12-21 20:28:24 -05:00
Diegoisawesome
052d458f48 sub_80796B4 is a pain 2018-12-21 12:20:28 -06:00
golem galvanize
314b718471 finish porting ice 2018-12-21 01:37:59 -05:00
DizzyEggg
ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
golem galvanize
64832ff67e start ice 2018-12-20 16:20:34 -05:00
DizzyEggg
7dcb614cca PSS is done 2018-12-20 22:14:36 +01:00
Diegoisawesome
6ef9671718
Merge pull request #440 from garakmon/fldeff 
Decompile / port fldeff_80F9BCC
 2018-12-19 22:16:59 -06:00
Marcus Huderle
b7ce383a96 Document a bunch of battle anims 2018-12-19 21:19:44 -06:00
Diegoisawesome
48d7c0a7a3
Merge pull request #454 from golemgalvanize/decompile_party_menu 
Decompile party menu
 2018-12-19 19:57:31 -06:00
Diegoisawesome
5b73fe138c
Merge pull request #457 from golemgalvanize/decompile_water 
Decompile water
 2018-12-19 19:16:40 -06:00
DizzyEggg
128239d65e Almost there 2018-12-19 22:47:27 +01:00
Deokishisu
e15c7fc7cf
Fix deleted line 2018-12-19 12:28:37 -05:00
Deokishisu
8edbad78e5
Add requirements to the fields of the object_event macro 
With these changes, the compiler will yell at you if you screw up the number of fields for your event objects while manually editing a map's events.inc. Making these fields required will prevent event corruption of all map events that are included after the map with the messed up fields.
 2018-12-19 12:20:38 -05:00
golem galvanize
cd785011fe decompiled water 2018-12-19 10:31:37 -05:00
Diegoisawesome
2592803460 Merge branch 'master' of github.com:pret/pokeemerald into trade 2018-12-18 19:54:27 -06:00
Diegoisawesome
cd994f4935 Begin trade.c 2018-12-18 19:29:41 -06:00
golem galvanize
f7df299be8 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_water 2018-12-18 20:23:32 -05:00
golem galvanize
15a7b1bc08 begin water.s 2018-12-18 20:23:07 -05:00
Marcus Huderle
b2ac3b6d6f Decompile most of battle_anim_effects_3.c 2018-12-18 19:15:59 -06:00
golem galvanize
42c5ceef3a finish party_menu, remove asm file 2018-12-18 05:38:33 -05:00
golem galvanize
8781d969ff finish party_menu 2018-12-18 05:38:08 -05:00
golem galvanize
c259ee46d3 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-18 05:31:39 -05:00
Marcus Huderle
c74468fd11 Document a bunch of battle anim stuff 2018-12-17 22:16:17 -06:00
Marcus Huderle
c04ce0ee64 Decompile battle_anim_effects_2.c 2018-12-17 22:16:17 -06:00
DizzyEggg
9ffd0c7382 3.5 asm left 2018-12-17 23:00:08 +01:00
golem galvanize
076d07f6fe Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-17 02:40:30 -05:00
golem galvanize
71a7a8a075 decompiled up to sub_81B8A7C 2018-12-17 02:39:17 -05:00
shinny456
60484153a5 decompile electric.s 2018-12-16 22:23:05 -05:00
garak
e292d0ca83
Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00
DizzyEggg
aae36b5653 6k left 2018-12-16 21:10:01 +01:00
Marcus Huderle
d1e6e705cc Decompile battle_anim_effects_1.c 2018-12-16 11:39:22 -06:00
Marcus Huderle
fb9a365dc6
Merge pull request #448 from Meowsy/pokedex-documentation 
Pokedex Documentation
 2018-12-15 18:06:42 -06:00
DizzyEggg
f1421d94c3 Up to sub 0x80ce580 2018-12-15 23:58:47 +01:00
Meowsy
bc11a4a9f4 Document various things relating to the Pokedex. 2018-12-15 15:12:28 -05:00
Marcus Huderle
1ca3656d74
Decompile contest_painting.c (#447) 2018-12-15 13:07:07 -06:00
Marcus Huderle
2c6849bee8
Decompile battle_anim_8170478.c (#445) 2018-12-13 21:33:54 -06:00
golem galvanize
6748ef72fb Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-13 00:31:06 -05:00
Marcus Huderle
170b6ef449
Decompile battle_intro.c (#444) 2018-12-12 23:18:25 -06:00
golem galvanize
2265d49ac2 decompiled up to sub_81B5A8C 2018-12-12 22:55:39 -05:00
DizzyEggg
59a69eb627 Storage up to icon palettes 2018-12-12 23:19:50 +01:00
DizzyEggg
74746603ad More pokemon storage 2018-12-11 23:09:12 +01:00
DizzyEggg
c5b5f4bd77 More storage 2018-12-10 23:42:44 +01:00
DizzyEggg
c2d8876174 Document PSS functions 2018-12-10 21:36:52 +01:00
golem galvanize
a6db7b2419 decompiled up to brm_cancel_1 2018-12-10 02:38:23 -05:00
garak
b4312648e2 decompile fldeff_80F9BCC with data 2018-12-09 19:22:59 -05:00
DizzyEggg
431e7e7e5c More storage work 2018-12-09 21:06:43 +01:00
Marcus Huderle
a7722a0b93
Decompile cable_car.c (#438) 2018-12-09 13:41:52 -06:00
DizzyEggg
e0f3de0b74 Start pokemon storage system 2018-12-09 16:44:01 +01:00
Marcus Huderle
342d23e0ba
Merge pull request #436 from KDSKardabox/master 
Decompile ghost
 2018-12-09 07:59:32 -06:00
KDSKardabox
4233ae50c3 Finish decompile ghost 2018-12-09 18:38:15 +05:30
KDSKardabox
f8838491f6 Initial commit for ghost 2018-12-09 13:44:07 +05:30
DizzyEggg
b94ae8bb92 Merge branch 'master' into weather 2018-12-08 22:10:20 +01:00
DizzyEggg
58c4cec946 decompile field screen 2018-12-08 21:42:36 +01:00
Marcus Huderle
88ffb09765
Merge pull request #432 from KDSKardabox/master 
De-compile fire
 2018-12-08 12:41:08 -06:00
KDSKardabox
1357449d73 Merge remote-tracking branch 'upstream/master' 2018-12-09 00:01:45 +05:30
DizzyEggg
4c23adb5f5 Decompile field weather 2018-12-08 19:05:03 +01:00
Marcus Huderle
f3a25f83cf
Decompile roulette_util.c (#434) 2018-12-08 11:56:59 -06:00
KDSKardabox
5630ab2b1e Fully decompile fire 2018-12-08 17:55:17 +05:30
KDSKardabox
0f82e5caf7 Intial commit for decomp fire 2018-12-08 15:15:52 +05:30
DizzyEggg
6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
golem galvanize
53fac4417b fixing merge conflicts 2018-12-07 14:47:20 -05:00
golem galvanize
18124740a4 pushing so I can merge 2018-12-06 23:14:33 -05: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
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
DizzyEggg
725f99a1bf Use :req macros 2018-12-02 19:24:06 +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
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
Marcus Huderle
9dd7f8f214
Decompile pokedex_area_screen.c (#412) 2018-11-30 10:41:03 -06: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
garak
50f00b0827 Merge remote-tracking branch 'upstream/master' into fldeff 2018-11-27 13:31:07 -05:00
Marcus Huderle
2425a14b19 Decompile fight.c 2018-11-26 10:25:51 -06:00
Marcus Huderle
35c0fb5154 Decompile ground.c 2018-11-26 09:55:31 -06:00
Marcus Huderle
839c629d5b Decompile dragon.c 2018-11-26 09:31:03 -06:00
Marcus Huderle
9b1f2ccf5e Decompile poison.c 2018-11-26 09:13:45 -06:00
Marcus Huderle
2c2431aa4c
Decopmile bug.c (#399) 2018-11-26 09:03:50 -06:00
Marcus Huderle
5947e0d229 Decompile rock 2018-11-25 17:00:18 -06:00
Marcus Huderle
fb6120da5b Fixup some names 2018-11-25 15:50:54 -06:00
Marcus Huderle
256bfc3caa Decompile script_pokemon_util_80F87D8 2018-11-25 15:32:22 -06:00
garak
f02cb667bb first 4 functions in fldeff 2018-11-20 09:51:54 -05:00
DizzyEggg
5d5b4b853c Merge branch 'master' into frontier 2018-11-19 17:32:32 +01:00
DizzyEggg
d22c2110de Decompile mossdeep hym 2018-11-19 17:16:01 +01:00
Marcus Huderle
72f0a079a9 Decompile all of battle_anim_utility_funcs 2018-11-19 09:37:25 -06:00