Commit Graph

1820 Commits

Author SHA1 Message Date
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
Diegoisawesome 04836db167 Start porting cable_club.c 2018-10-11 16:02:58 -05:00
golem galvanize 803c2388ce finish porting field_effect_helpers 2018-10-10 12:02:02 -04:00
golem galvanize 35ee9f67c0 ported some of field_effect_helpers 2018-10-09 17:32:39 -04:00