ultima-soul
76510d58bb
Matched up to sub_80DBF68, sub_80DBF90 WIP.
2019-01-06 13:32:47 -08:00
Marcus Huderle
95db853a78
Decompile more of contest_link_80F57C4.c
2019-01-04 20:03:29 -06:00
Marcus Huderle
fd201f8395
Start decompiling contest_link_80F57C4.c
2019-01-03 20:35:20 -06:00
Marcus Huderle
2857f7fff9
Decompile contest_link_81D9DE4.c
2019-01-03 20:35:20 -06:00
Marcus Huderle
bc43dbab13
Decompile contest_link_81D9DE4.c
2019-01-03 20:35:20 -06:00
Marcus Huderle
e1092028ec
Decompile match_call.c
2019-01-02 19:46:15 -06:00
Diegoisawesome
e7f8190ba3
Finish roulette port
2019-01-01 15:25:52 -06:00
Diegoisawesome
d28d8c850d
Up to sub_81446DC
2018-12-31 19:39:41 -06:00
Diegoisawesome
af1e44befe
Continue porting roulette
2018-12-31 18:07:29 -06:00
Diegoisawesome
439fa13e94
Start porting/decompiling roulette
2018-12-31 16:09:45 -06:00
Diegoisawesome
d004ce065c
Merge branch 'master' of github.com:pret/pokeemerald into trade
2018-12-31 02:30:30 -06:00
Diegoisawesome
ec780bb209
Cleanup and documentation
2018-12-31 02:22:21 -06:00
Diegoisawesome
c22a12d8d6
trade source done
2018-12-29 13:50:24 -06:00
Diegoisawesome
2fb9f490fb
Almost done with trade
2018-12-29 12:46:15 -06:00
DizzyEggg
55e44b0951
a bit more of contest painting effect
2018-12-29 11:48:28 -06:00
DizzyEggg
34243bbe1d
Start contest painting effect
2018-12-29 11:48:28 -06:00
Marcus Huderle
8eea0925c5
Finish battle_anim_effects_3.c
2018-12-29 11:40:12 -06:00
Marcus Huderle
95dcff581b
Document some fieldmap stuff
2018-12-29 11:36:54 -06:00
Diegoisawesome
146ad2bdd4
Next big honkin' function done
2018-12-28 13:42:34 -06:00
Melody
6d556f8cf7
improve checkplayergender calls
...
clean up constant definitions
make tweaks from review
2018-12-28 08:22:21 -06:00
Diegoisawesome
9cad5e8197
Big switch mofo
2018-12-28 02:11:41 -06:00
Marcus Huderle
d59f5a8e56
Misc overworld documentation
2018-12-27 16:52:13 -06:00
Diegoisawesome
5691a67629
Up to sub_807B62C
2018-12-27 02:05:09 -06:00
Marcus Huderle
a1ea3b5e39
Use map_header_flags macro ( #483 )
2018-12-26 12:20:15 -06:00
Diegoisawesome
d8948a5cda
Merge remote-tracking branch 'pret/master' into trade
2018-12-25 15:03:13 -06:00
Diegoisawesome
dea41e1a7e
trade.c up to sub_807A7E0
2018-12-24 20:18:06 -06:00
DizzyEggg
e230afd543
Merge branch 'master' into learn
2018-12-24 22:01:52 +01:00
DizzyEggg
442b1826a2
asm party and fldeff clean-up
2018-12-24 21:59:05 +01:00
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
DizzyEggg
f2d3babd30
rename to mossdeep gym
2018-11-18 20:04:53 +01:00
DizzyEggg
4e37723288
Document Battle Pyramid
2018-11-18 17:52:22 +01:00
DizzyEggg
40a44a8508
more battle pytamid
2018-11-17 22:55:39 +01:00
DizzyEggg
eb66b60f38
Begin battle pyramid
2018-11-17 15:30:34 +01:00
Diegoisawesome
032dd251e6
Merge pull request #383 from garakmon/createsprite
...
Update createsprite macro and rename BANK to BATTLER
2018-11-15 14:45:13 -06:00
garak
c6833c903c
remove extra macro and shorten names
2018-11-13 16:19:52 -05:00
garak
269aebaca7
update createsprite macro and rename BANK to BATTLER
2018-11-13 15:35:46 -05:00
DizzyEggg
b5ea69cf74
Fix conflicts
2018-11-12 19:22:23 +01:00
DizzyEggg
69683f9572
Decompile Battle Palace
2018-11-12 15:41:19 +01:00
Slawter666
1b895ff52c
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
2018-11-12 14:14:50 +00:00
DizzyEggg
3b3cffac44
Decompile battle pike
2018-11-12 14:07:31 +01:00
DizzyEggg
4fb463377c
Start battle pike
2018-11-12 00:46:02 +01:00
DizzyEggg
a4235c9ff8
Document battle arena
2018-11-11 18:33:16 +01:00
DizzyEggg
81410fee17
Factory done
2018-11-11 16:44:27 +01:00
Diegoisawesome
18839a4872
Merge remote-tracking branch 'pret/master' into script_menu
2018-11-06 20:20:56 -06:00
Diegoisawesome
054a015c95
Finish decompiling/porting script_menu
2018-11-06 20:13:40 -06:00
Diegoisawesome
9afe7a896e
Merge remote-tracking branch 'pret/master' into render_text
2018-11-06 11:40:17 -06:00
Diegoisawesome
43a8534fce
Merge remote-tracking branch 'origin/master' into render_text
2018-11-06 11:33:21 -06:00
Diegoisawesome
f8d337e491
Finish cleaning up text.c
2018-11-06 11:30:21 -06:00
Diegoisawesome
7dd4ed7060
r5/r6 swap on sub_80E2578
2018-11-05 14:45:54 -06:00
Slawter666
bd766b9049
Minor labelling of field effects
2018-11-03 20:20:28 +00:00
DizzyEggg
0bb51037d7
Finish frontier util
2018-11-01 21:31:10 +01:00
DizzyEggg
37d742cbd8
Document recorded battle
2018-11-01 15:06:50 +01:00
Diegoisawesome
645830624d
Continue script_menu.c
2018-10-31 23:03:41 -05:00
DizzyEggg
7de1c4bd14
Make frontier util compile
2018-10-30 22:17:03 +01:00
DizzyEggg
90ef269426
Merge branch 'master' into battle_frontier_2
2018-10-30 21:48:18 +01:00
DizzyEggg
0da7d7e6ae
why is this function so hard to match
2018-10-30 21:45:26 +01:00
Diegoisawesome
2837859bdb
Merge pull request #373 from garakmon/battle-anim
...
Split battle_anim_80FE840 and move data to C
2018-10-30 11:53:05 -05:00
DizzyEggg
3a9eeef844
Frontier, finish ranking hall
2018-10-28 21:11:53 +01:00
DizzyEggg
98d8dbfd8a
Up to sub_81a443c
2018-10-28 00:50:06 +02:00
DizzyEggg
e850517123
more battle frontier 2
2018-10-27 21:01:35 +02:00
DizzyEggg
269d7c2510
up to factory
2018-10-27 17:39:05 +02:00
DizzyEggg
826d0ea2ab
Begin frontier records
2018-10-27 15:44:29 +02:00
DizzyEggg
1efdaebe23
finish decompiling battle tower
2018-10-25 21:27:10 +02:00
DizzyEggg
549b669f2a
battle tower, match sth and dumb loop instead of goto
2018-10-24 23:14:45 +02:00
garak
5ddf6655bc
split battle_anim_80FE840.s
2018-10-22 22:08:38 -04:00
DizzyEggg
b330bdba51
More and more battle tower
2018-10-22 19:22:57 +02:00
Diegoisawesome
32d2640dc7
Match GameClear (thanks Egg)
2018-10-21 16:24:43 -05:00
DizzyEggg
0ab27e44b1
more tower, fail
2018-10-21 20:13:12 +02:00
Diegoisawesome
97bbb326b8
GameClear nonsense
2018-10-20 19:53:41 -05:00
golem galvanize
ba3247d5cd
decompiled more, stuck on sub_81B1760
2018-10-20 20:25:28 -04:00
Slawter666
3d8874d919
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
2018-10-21 00:20:09 +01:00
DizzyEggg
16026fe91d
More battle tower.
2018-10-21 00:06:42 +02:00
DizzyEggg
f4e55999a5
begin porting and decomping battle tower
2018-10-20 00:33:51 +02:00
Diegoisawesome
bf8fa23462
Merge pull request #365 from garakmon/event-flags
...
[WIP] Event flags
2018-10-19 14:24:34 -05:00
garak
113a8d1efd
clean flags and remove temp macro
2018-10-19 14:59:18 -04:00
Diegoisawesome
dd3689fdbf
Finish porting/decompiling field_player_avatar
2018-10-19 00:05:54 -05:00
Diegoisawesome
6206acd2d2
Finish shop and fldeff_escalator
2018-10-18 12:05:02 -05:00
garak
d1b7f32b0a
begin event flag names, add temporary hidden item macro
2018-10-17 22:07:23 -04:00
golem galvanize
2c6d634acd
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
2018-10-17 20:03:31 -04:00
golem galvanize
65a0c48eec
decompiled some more of the file
2018-10-17 20:03:02 -04:00
garak
7d88b9647f
Merge branch 'master' into event-flags
2018-10-17 12:30:45 -04:00
garak
da1b5365a7
label a flag in the asm
2018-10-17 08:55:09 -04:00
Diegoisawesome
e75f0b4f80
Port/decompile field_control_avatar
2018-10-16 21:47:08 -05:00
Slawter666
1435c96b41
Further synchronisation
2018-10-17 01:11:44 +01:00
Slawter666
3aff112127
Begin synchronising with pokeruby
2018-10-16 14:55:16 +01:00
Diegoisawesome
a9abb930aa
Merge pull request #352 from huderlem/shop
...
[WIP] Shop
2018-10-14 19:03:48 -05:00
Slawter666
137f6549ff
label field_effect_helpers
2018-10-14 23:43:40 +01:00
Diegoisawesome
02049d52ee
Merge pull request #351 from DizzyEggg/apprentice
...
Decompile apprentice
2018-10-14 13:20:38 -05:00
Diegoisawesome
d40e737d52
Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers
...
Decompile field effect helpers
2018-10-14 12:48:18 -05:00
DizzyEggg
f47ed3268c
Finish documenting apprentice for now
2018-10-14 17:00:41 +02:00
DizzyEggg
84936b4260
Merge branch 'master' into apprentice
2018-10-14 15:07:16 +02:00
DizzyEggg
145df49063
Document more of apprentice
2018-10-14 14:35:51 +02:00
DizzyEggg
b4a42a6832
Decompile apprentice
2018-10-14 11:37:44 +02:00
DizzyEggg
36b8a6a9a2
More apprentice work
2018-10-13 23:23:33 +02:00
DizzyEggg
a496a763ca
Merge record mixing, pokemon and global with apprentice
2018-10-13 20:38:46 +02:00
Diegoisawesome
32fbf67d47
Merge branch 'master' into shop
2018-10-13 12:55:06 -05:00
Diegoisawesome
a26380663c
Merge branch 'master' of github.com:pret/pokeemerald
2018-10-13 12:44:23 -05:00
Diegoisawesome
35c6938814
Port/decompile cable_club.s
2018-10-13 12:41:10 -05:00
Marcus Huderle
b24559d69b
Merge remote-tracking branch 'upstream/master' into shop
...
# Conflicts:
# asm/shop.s
2018-10-13 10:22:58 -05:00
DizzyEggg
74b81bf229
start apprentice
2018-10-13 00:48:26 +02:00
golem galvanize
d3d725cc83
decompiled up to sub_81B0948
2018-10-11 21:23:39 -04:00