Diegoisawesome
d66c1c642c
Port/decompile fieldmap.c
2018-05-09 05:07:56 -05:00
PikalaxALT
fd1d75ce37
Merge branch 'master' into mauville_old_man
2018-05-07 18:18:00 -04:00
PikalaxALT
0231ed13ee
Remaining functions in mauville_old_man
2018-05-07 16:35:29 -04:00
Slawter666
279a6e1ddc
Convert item_icon_table.inc to C
2018-05-06 13:37:28 +01:00
Slawter666
aab1238ec0
Revert "Convert item_graphics.inc to C"
...
This reverts commit 546217d281
2018-05-06 09:12:23 +01:00
Slawter666
546217d281
Convert item_graphics.inc to C
...
I have tried to group the items that share the same icon but have different palettes where possible. This commit also splits data/graphics.s into two files.
2018-05-05 23:27:26 +01:00
Slawter666
22ec43a6ed
resolve merge conflicts
2018-05-05 18:50:26 +01:00
PikalaxALT
58200616d5
Merge branch 'master' into trader
2018-05-04 17:45:50 -04:00
PikalaxALT
8aa462cd74
through sub_8121178
2018-05-03 18:05:07 -04:00
Marcus Huderle
cdb5e9e314
Merge pull request #242 from DizzyEggg/decompile_battle_records
...
Decompile battle records
2018-05-03 08:42:44 -07:00
PikalaxALT
21c3e7e8e5
through SetMauvilleOldMan
2018-05-02 11:31:58 -04:00
PikalaxALT
4b1e30434d
Through sub_80D787C
2018-05-01 19:47:11 -04:00
PikalaxALT
4acbcf5759
Port trader from Ruby
2018-05-01 15:19:24 -04:00
DizzyEggg
ae78786723
identify and name battle records things
2018-05-01 15:33:13 +02:00
DizzyEggg
95cf853762
battle records more decomp and subtle name changes
2018-05-01 14:01:54 +02:00
DizzyEggg
f9a2f6c4a2
start decompiling battle records
2018-05-01 12:38:55 +02:00
DizzyEggg
25c669e36b
decompile item
2018-04-29 13:36:26 +02:00
Slawter666
39fd42faea
convert data/items.inc to include/data/items.h
...
OK
2018-04-25 02:33:55 +01:00
Slawter666
a49f80d552
Convert item_descriptions.inc to .h
...
OK
2018-04-25 01:41:04 +01:00
Slawter666
a9d65ae6b6
Move files to include/data
2018-04-24 00:58:14 +01:00
Slawter666
a04f8f6ee3
Convert item data files to .c (not compiling)
2018-04-23 21:44:46 +01:00
Diegoisawesome
d10844f1fe
Merge pull request #237 from KDSKardabox/master
...
Decompile mon markings, rotating_gate & field_camera
2018-04-18 14:12:51 -05:00
Diegoisawesome
4e63a52832
Merge pull request #238 from DizzyEggg/decompile_battle_anim_sound_tasks
...
decompile battle_anim_sound_tasks
2018-04-18 11:40:01 -05:00
DizzyEggg
3d12a02f3e
almost decomp sound tasks battle anim
2018-04-18 16:03:15 +02:00
KDSKardabox
7700fe61fe
Decompile field camera
2018-04-18 17:42:41 +05:30
KDSKardabox
b818924feb
Decompile rotating_rate & remove debug check
2018-04-18 14:09:50 +05:30
KDSKardabox
f5cbefc295
Decompile mon markings
2018-04-17 14:24:39 +05:30
KDSKardabox
936bb5925a
Decompile dewford trend
2018-04-16 16:22:13 +05:30
KDSKardabox
447afe4505
Decompile pokemon icon
2018-04-13 17:51:49 +05:30
KDSKardabox
66e76d9633
Decompile script movement
2018-04-10 14:55:25 +05:30
KDSKardabox
a3d065d0bd
Decompile rom6
2018-04-10 12:17:29 +05:30
KDSKardabox
a18dc6aa80
Decompile map_name_popup
2018-04-09 12:52:28 +05:30
KDSKardabox
3948614bff
Decompile map_obj_lock
2018-04-03 16:22:31 +05:30
Edouard Veyrier
b2e8ee836d
sub_81607EC and sub_816082C
2018-04-02 20:06:40 +02:00
Edouard Veyrier
6e919da4aa
Change order in ld_script.txt
2018-03-29 20:41:29 +02:00
Edouard Veyrier
17b9f5d892
Fix compile error
2018-03-29 15:46:10 +02:00
Marcus Huderle
a5cd6e8ef4
Merge pull request #231 from KDSKardabox/master
...
Player PC
2018-03-28 21:45:24 -07:00
Marcus Huderle
d4c6ef7ae6
Merge pull request #227 from PikalaxALT/pokenav_match_call
...
Pokenav match call
2018-03-28 21:33:50 -07:00
Anders Løvig
6cd590f4fd
Decompiled start_menu.s
2018-03-28 00:40:00 +02:00
KDSKardabox
f9f64fff42
Resolve conflicts
2018-03-19 16:15:13 +05:30
KDSKardabox
a24ffb1321
Finish decompiling player_pc rodata
2018-03-19 15:57:33 +05:30
KDSKardabox
a454bd98fa
Finish .text part of player_pc
2018-03-16 16:01:11 +05:30
KDSKardabox
e7cf8e5c17
Start decompile player_pc
2018-03-12 13:56:20 +05:30
DizzyEggg
711a345fd4
fix conflicts
2018-03-09 22:54:57 +01:00
PikalaxALT
7b9930a0a2
Remaining data in match_call
2018-03-04 16:58:51 -05:00
PikalaxALT
9b25d02369
Match call data, 1
2018-03-04 16:14:56 -05:00
PikalaxALT
734375f101
Remaining functions in match_call
2018-03-04 15:47:54 -05:00
DizzyEggg
4c3f8ac6c6
start item menu icons decomp
2018-03-04 18:41:07 +01:00
DizzyEggg
18a92fdcc0
list menu is decompiled
2018-03-03 14:58:41 +01:00
PikalaxALT
df128cbfed
Merge branch 'master' into pokenav_match_call
2018-03-02 21:49:09 -05:00
DizzyEggg
ae29f35afd
start decompiling list menu
2018-03-02 16:34:31 +01:00
PikalaxALT
988be1ab86
Carve out Match Call functions
2018-02-28 22:47:50 -05:00
KDSKardabox
85492c0dac
Merge branch 'master' of https://github.com/pret/pokeemerald
2018-03-01 09:13:29 +05:30
KDSKardabox
2f9d69f67f
use free_and_set_null macros
2018-03-01 09:11:26 +05:30
DizzyEggg
988f0b7e19
Merge branch 'master' into decompile_battle_link_817C95C
2018-03-01 01:01:18 +01:00
Diegoisawesome
bcef4e7d1c
Merge pull request #221 from DizzyEggg/data_to_c
...
Move some data to C
2018-02-28 16:55:45 -06:00
Diegoisawesome
a57e04e14d
Merge pull request #220 from PikalaxALT/trainer_rematch
...
Decompile trainer_rematch
2018-02-28 16:41:54 -06:00
DizzyEggg
85a959f321
clean up files
2018-02-28 13:07:58 +01:00
DizzyEggg
59ff4aec9b
decompile and document battle tv
2018-02-27 20:40:09 +01:00
PikalaxALT
7f7b182ca4
sub_81D1574
2018-02-27 08:47:47 -05:00
KDSKardabox
835777dec2
Decompile fleff_flash rodata
2018-02-27 10:33:23 +05:30
PikalaxALT
f46e941f30
Name functions, variables, and that one flag constant
2018-02-26 08:23:17 -05:00
KDSKardabox
2d7d686cc1
Decompile fldeff_flash
2018-02-26 17:54:54 +05:30
DizzyEggg
8821d6396a
move battle moves to C
2018-02-26 12:59:52 +01:00
PikalaxALT
6bfc8579ad
Decompile trainer_rematch
2018-02-25 21:56:09 -05:00
DizzyEggg
558133bba0
almost match
2018-02-24 13:44:26 +01:00
KDSKardabox
48fdddf638
Bring non-matchings in a compiling state
2018-02-22 15:15:03 +05:30
KDSKardabox
a3c17fad22
Decompile Fossil Special & Groundshake Data
2018-02-22 12:17:46 +05:30
DizzyEggg
25a57093b1
start battle link file
2018-02-20 02:01:51 +01:00
KDSKardabox
9719e2fa22
Start decompile fossil_specials.s
2018-02-19 15:37:02 +05:30
KDSKardabox
5ed68a87f8
Merge branch 'master' of https://github.com/pret/pokeemerald
2018-02-18 17:35:36 +05:30
KDSKardabox
b1cb82fc67
Finish fldeff_groundshake
2018-02-18 17:33:48 +05:30
Diegoisawesome
ebd88b3606
Merge branch 'master' of https://github.com/pret/pokeemerald into intro
2018-02-17 04:03:59 -06:00
Diegoisawesome
1605f62535
Decompile credits
2018-02-17 04:00:22 -06:00
Diegoisawesome
bc4bb5b32e
Start intro_credits_graphics decomp
2018-02-16 13:08:21 -06:00
KDSKardabox
e518a40508
[WIP} Start decomp Ground Shake
2018-02-16 15:21:27 +05:30
Diegoisawesome
0a206ee52c
Finish decompiling intro
2018-02-15 22:30:39 -06:00
KDSKardabox
ffeca135bc
Merge branch 'master' of https://github.com/pret/pokeemerald
2018-02-16 09:29:11 +05:30
Diegoisawesome
34716558b1
Almost finish decompiling intro
2018-02-15 16:54:34 -06:00
KDSKardabox
a200d9406b
Finish fldeff_softboiled.c
2018-02-15 22:32:28 +05:30
DizzyEggg
90fa97f810
merge overworld with master
2018-02-15 12:41:32 +01:00
KDSKardabox
64683e1473
[WIP] Decompile fledd_softboiled.h
2018-02-15 15:29:26 +05:30
KDSKardabox
895c72cb26
Merge branch 'master' of https://github.com/pret/pokeemerald
2018-02-15 09:45:15 +05:30
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
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
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
0ca0ad1c63
Decompile birch_pc.c
2018-02-12 15:42:15 +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
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
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
5707c5c7c6
start pokemon 3
2018-02-10 02:06:32 +01:00
golem galvanize
99d0b4bbfd
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu
2018-02-09 17:47:01 -05:00
DizzyEggg
1a1bad3129
decompile pokemon_item_effect
2018-02-09 18:46:00 +01:00
golem galvanize
de95a703b0
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
2018-02-08 16:03:53 -05: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
golem galvanize
03f8d0d6ce
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu
2018-02-07 19:31:33 -05:00
golem galvanize
4a903279df
decompile task_new_game_prof_birch_speech_4
2018-02-07 19:30:58 -05:00
Diegoisawesome
772fd47564
Merge branch 'master' of https://github.com/pret/pokeemerald into menu
2018-02-07 18:06:59 -06:00
golem galvanize
caf5d136b9
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
2018-02-07 18:59:00 -05:00
DizzyEggg
4b7d778a5c
move mon data fix conflicts
2018-02-07 20:17:55 +01:00
golem galvanize
b67afb9490
I hope this fixes the conflicts
2018-02-07 14:14:08 -05:00
golem galvanize
1b303aeee8
decompiled up to task_new_game_prof_birch_speech_3
2018-02-07 14:11:08 -05: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
Cameron Hall
13bc7a8dd2
Merge pull request #166 from camthesaxman/battle_refactor
...
rename/refactor battle code
2018-02-07 12:46:12 -06:00
Diegoisawesome
d396a8f89c
Merge new_menu_helpers and menu
2018-02-07 00:07:42 -06:00
Diegoisawesome
18abda9dca
Finish menu.s and eliminate TextColor
2018-02-06 20:37:54 -06:00
camthesaxman
607cba8c2e
Merge branch 'master' into battle_refactor
2018-02-05 17:38:23 -06:00
DizzyEggg
541fef5368
move wild data to C
2018-02-05 22:27:29 +01:00
DizzyEggg
ae8e89a10d
move some pokemon data to c
2018-02-05 17:39:26 +01:00
golem galvanize
5f7709dc8b
decompile item_menu
2018-02-04 23:47:47 -05:00
DizzyEggg
0c60ffe22a
decompile title screen
2018-02-04 16:11:00 +01:00
PikalaxALT
d52f52fa73
Merge branch 'master' into link
2018-02-03 09:42:19 -05:00
DizzyEggg
27452ca822
decompile rtc reset screen
2018-02-02 19:00:01 +01:00
DizzyEggg
e13eacda39
decompile item icon
2018-02-02 16:06:20 +01:00
DizzyEggg
ebc8af50f1
decompile berry tag screen
2018-02-02 14:03:48 +01:00
DizzyEggg
14d2caaf8d
start decompiling berry tag screen
2018-02-02 12:32:12 +01:00
DizzyEggg
b697497835
ray scene is decompiled
2018-02-01 14:47:41 +01:00
ProjectRevoTPP
78bd2b0849
move save rodata to source and use saveblock chunk macros
2018-01-31 15:26:57 -05:00
golem galvanize
e78697494c
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
2018-01-31 00:29:38 -05:00
ProjectRevoTPP
e7fffb5e9a
merge
2018-01-31 00:13:49 -05:00
Diegoisawesome
3167dec946
Merge pull request #188 from golemgalvanize/decompile_field_message_box
...
decompile field_message_box
2018-01-30 23:11:53 -06:00
ProjectRevoTPP
09302c0bc5
Merge branch 'master' of https://github.com/pret/pokeemerald into field_map_obj_helpers
2018-01-30 23:23:45 -05:00
Diegoisawesome
eb5737357d
Merge pull request #194 from DizzyEggg/decompile_mystery_event_menu
...
decompile mystery event menu
2018-01-30 20:33:27 -06:00
golem galvanize
f7c9a6cb54
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu
2018-01-30 19:38:24 -05:00
ProjectRevoTPP
c5f1b576f2
Merge branch 'master' of https://github.com/pret/pokeemerald into field_map_obj_helpers
2018-01-30 18:24:14 -05:00
ProjectRevoTPP
6453b88433
finish decompiling field_map_obj_helpers.c
2018-01-30 18:19:41 -05:00
DizzyEggg
9fbedcc41c
coord weather fix conflicts
2018-01-31 00:02:16 +01:00
DizzyEggg
741b8adf9a
decompile mystery event menu
2018-01-30 23:23:35 +01:00
Diegoisawesome
b3315b64a1
Merge pull request #187 from golemgalvanize/decompile_item_use
...
decompile item_use
2018-01-30 15:41:43 -06:00
Diegoisawesome
232dea1a63
Merge pull request #193 from DizzyEggg/decompile_scanline_effect
...
decompile scanline effect
2018-01-30 15:37:34 -06:00
golem galvanize
231b69451b
fixed
2018-01-30 16:33:20 -05:00
Diegoisawesome
6873f47821
Merge pull request #190 from DizzyEggg/decompile_time_events
...
decompile time events
2018-01-30 15:20:24 -06:00
golem galvanize
59b0e69820
adding ld_script
2018-01-30 13:22:59 -05:00
DizzyEggg
db3ecf5012
decompile scanline effect
2018-01-29 17:47:12 +01:00
