Commit Graph

996 Commits

Author SHA1 Message Date
DizzyEggg 90fa97f810 merge overworld with master 2018-02-15 12:41:32 +01:00
DizzyEggg 4b4495f3fe overworld review changes 2018-02-15 12:36:52 +01:00
KDSKardabox 64683e1473 [WIP] Decompile fledd_softboiled.h 2018-02-15 15:29:26 +05:30
KDSKardabox 2fb78b5ca8 Fix reviewed points. 2018-02-15 09:47:42 +05:30
KDSKardabox 895c72cb26 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-15 09:45:15 +05:30
golem galvanize c3c30417ef fixes 2018-02-14 20:45:27 -05:00
KDSKardabox deeaac2bf1 Decompile fldeff_sweetsecent.c 2018-02-14 17:24:31 +05:30
golem galvanize e1bd37dca9 fix merge conflicts 2018-02-13 22:19:14 -05:00
golem galvanize e5b6d15f91 move data to c 2018-02-13 22:12:02 -05:00
DizzyEggg 5dde701c81 merge overworld with master 2018-02-14 01:12:17 +01:00
DizzyEggg 94b47c0686 decompile overworld 2018-02-14 00:58:22 +01:00
KDSKardabox c959dc1174 Finish fldeff_strength.s 2018-02-13 23:08:54 +05:30
KDSKardabox e375606810 [Do not Merge] fldeff_strength.s 2018-02-13 21:52:33 +05:30
KDSKardabox aaea65c37b Merge branch 'master' of https://github.com/pret/pokeemerald
# Conflicts:
#	include/strings.h
2018-02-13 10:02:27 +05:30
KDSKardabox ae321d6e7c move to strings.h 2018-02-13 09:32:40 +05:30
KDSKardabox 7b360b2e33 Review fixes 2018-02-13 09:16:38 +05:30
golem galvanize 4ac064bbaf Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-12 14:00:47 -05:00
golem galvanize f81c52b56e more fixes 2018-02-12 13:59:42 -05:00
DizzyEggg f22be4d010 more overworld work 2018-02-12 18:26:26 +01:00
DizzyEggg 382442c4c8 start decompiling overworld.s 2018-02-12 15:01:43 +01:00
KDSKardabox 54922641af Port smokescreen.s 2018-02-12 16:44:04 +05:30
KDSKardabox 185cf71842 Missing label 2018-02-12 16:17:57 +05:30
KDSKardabox d52a54e64f Updating pokedex count function labels 2018-02-12 16:15:51 +05:30
Diegoisawesome a4787bc06a Merge pull request #207 from DizzyEggg/decompile_pokemon_123
Decompile and clean pokemon files
2018-02-11 22:13:15 -06:00
golem galvanize f2144e9932 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-11 20:34:56 -05:00
PikalaxALT 590c4b500b Merge branch 'master' into record_mixing 2018-02-11 20:12:40 -05:00
PikalaxALT ea347199a2 Merge branch 'master' into link 2018-02-11 19:22:06 -05:00
DizzyEggg 5e781f5b3f change some constants to male and female 2018-02-12 00:11:10 +01:00
golem galvanize 42cfbcb197 some fixes 2018-02-11 18:00:45 -05:00
DizzyEggg 2736c0fd4a add more const pokemon data, clear include 2018-02-11 23:46:50 +01:00
golem galvanize 601a942db4 decompile main_menu 2018-02-11 17:19:36 -05:00
DizzyEggg fd17ca59b0 more pokemon work 2018-02-11 17:35:01 +01:00
DizzyEggg 084ba7a7a4 decompile all pokemon files 2018-02-10 13:24:03 +01:00
DizzyEggg 1a1bad3129 decompile pokemon_item_effect 2018-02-09 18:46:00 +01:00
DizzyEggg 9e7696f25a decompile pokemon1 2018-02-09 15:55:12 +01:00
golem galvanize 56e1a52823 Fixes 2018-02-08 21:00:28 -05:00
DizzyEggg bce01bc518 battle labels merge with master 2018-02-09 00:43:07 +01:00
Diegoisawesome 387dbf48d0 Merge pull request #202 from DizzyEggg/move_mon_data
Move data from asm to pokemon_1.c
2018-02-08 14:06:57 -06:00
DizzyEggg 9df5e16343 more battle labels 2018-02-08 12:13:29 +01:00
DizzyEggg 96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
Diegoisawesome 772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
DizzyEggg a10fd5a7c4 create more battle constants 2018-02-08 00:35:13 +01:00
DizzyEggg caf9af321d get rid of unnecessary externs 2018-02-08 00:00:25 +01:00
DizzyEggg 1a32010f13 iwram common symbols to c 2018-02-07 23:21:51 +01:00
DizzyEggg 5ac6cc4860 move battle vars to c file 2018-02-07 22:53:40 +01:00
DizzyEggg 4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01:00
DizzyEggg c5e2092e8b title screen with master 2018-02-07 20:10:56 +01:00
Diegoisawesome 802b505d7b Merge pull request #199 from DizzyEggg/decompile_rtc_screen
decompile rtc reset screen
2018-02-07 13:03:59 -06:00
Diegoisawesome ccae0ee970 Merge pull request #198 from DizzyEggg/decompile_item_icon
decompile item icon
2018-02-07 12:59:40 -06:00
Diegoisawesome 1ae5adbb19 Merge pull request #196 from DizzyEggg/decompile_ray_scene
Decompile rayquaza scene
2018-02-07 12:59:13 -06:00