DizzyEggg
0fe3e612eb
battle tent start and create frontier struct in saveblock
2018-06-17 12:30:09 +02:00
DizzyEggg
3bcd30969a
cut field effect is decompiled and documented
2018-06-16 14:04:29 +02:00
DizzyEggg
7ea5dd7923
start fldeffect cut
2018-06-16 00:45:48 +02:00
Marcus Huderle
acc1a5d446
Get all map constants from include/ rather than constants/
2018-06-15 07:49:21 -05:00
Marcus Huderle
0c8cfc2297
Merge pull request #264 from Mother-Of-Dragons/master
...
tileset_anims.c typo fix
2018-06-14 09:10:50 -05:00
Avara
7a9c9bee85
tileset_anims.c typo fix
2018-06-14 14:34:19 +01:00
Marcus Huderle
bebcea4029
Merge pull request #263 from huderlem/event_object_movement
...
Sync event object movement with pokeruby
2018-06-14 08:08:51 -05:00
Marcus Huderle
4d13e3394a
Bring all movement function names up-to-date with pokeruby
2018-06-13 17:51:26 -05:00
Marcus Huderle
aa9a45c16f
Rebrand 'map object' and 'field object' to 'event object'
2018-06-11 19:11:48 -05:00
Marcus Huderle
ed245b677a
Add remaining rodata to event_object_movement.c
2018-06-11 18:17:31 -05:00
Marcus Huderle
89edf6d9e9
Move all field object data into src/data and event_object_movement.c
2018-06-11 17:33:50 -05:00
Avara
3bed36276d
updated label names
2018-06-11 21:57:22 +01:00
Avara
7de91ed6ae
updated label names
2018-06-11 21:22:41 +01:00
Marcus Huderle
eb8dbff4a7
Move event_object_movement_helpers into event_object_movement
2018-06-11 10:56:14 -05:00
Marcus Huderle
73327f0d44
Decompile field_ground_effect into event_object_movement.c
2018-06-11 10:23:14 -05:00
Marcus Huderle
4018acfae1
Update event object struct members
2018-06-11 09:19:17 -05:00
Marcus Huderle
38a126df66
Rename field_map_obj to event_object_movement
2018-06-11 08:46:33 -05:00
DizzyEggg
5526d980ec
union room is too hard
2018-06-10 18:28:37 +02:00
DizzyEggg
166295acc7
union room prepare for battle
2018-06-09 22:14:52 +02:00
DizzyEggg
7b72cfdc6c
through sub_80156C8
2018-06-04 23:32:28 +02:00
DizzyEggg
dbb9cdd424
more link stuff
2018-06-04 12:07:32 +02:00
DizzyEggg
e50f4b4999
still going
2018-06-03 22:39:10 +02:00
DizzyEggg
e95b1156d2
more progress
2018-06-03 09:37:01 +02:00
DizzyEggg
83cf2f50df
shabby beginnings
2018-06-01 23:08:25 +02:00
Diegoisawesome
0b09575fd4
Merge pull request #249 from golemgalvanize/decompile_pokedex
...
Decompile pokedex
2018-06-01 00:02:46 -07:00
golem galvanize
94030c6b53
fixed as best I could
2018-05-31 07:08:24 -04:00
Diegoisawesome
dd28854a22
Merge pull request #255 from DizzyEggg/decomp_record_mixing
...
Fix pika's Record Mixing PR
Also closes #107 .
2018-05-30 16:51:30 -07:00
DizzyEggg
42731e4b88
LANG_ENG to GAME_LANGUAGE
2018-05-30 20:28:31 +02:00
DizzyEggg
ff0c615870
decompile rom_8034C54
2018-05-27 23:26:01 +02:00
DizzyEggg
357afd91b5
start rom_8034C54 decomp
2018-05-27 17:42:48 +02:00
DizzyEggg
dd1c7c741a
make record mixing compile
2018-05-26 00:37:03 +02:00
DizzyEggg
9e7965fab0
document record mixing
2018-05-26 00:25:36 +02:00
DizzyEggg
b051cbaaab
more record mixing decomp
2018-05-25 21:00:41 +02:00
PikalaxALT
6ae395a636
Merge branch 'master' into contest
2018-05-24 10:26:55 -04:00
DizzyEggg
03b593d3c3
try my luck with record mixing
2018-05-22 21:54:57 +02:00
DizzyEggg
c8e1c80375
record mixing fix for real hopefully
2018-05-20 12:21:39 +02:00
DizzyEggg
4d5bfc149e
Merge branch 'master' into decomp_record_mixing
2018-05-20 12:16:45 +02:00
DizzyEggg
1a8d5132d6
fix record mixing for real
2018-05-20 10:51:09 +02:00
Diegoisawesome
de60bdf2fe
Merge pull request #256 from DizzyEggg/decompile_field_tasks
...
Decompile field tasks
2018-05-19 23:34:30 -05:00
DizzyEggg
1307fde8ca
make field tasks compile
2018-05-19 18:13:48 +02:00
DizzyEggg
d1798d0ed9
decompile field tasks
2018-05-19 18:02:43 +02:00
DizzyEggg
11d8f489c4
failed attempt
2018-05-19 14:30:41 +02:00
DizzyEggg
e44f35c7b7
fix record mixing merge conflicts
2018-05-19 12:32:44 +02:00
DizzyEggg
9385036ff7
make menu indicators compile
2018-05-19 11:53:22 +02:00
DizzyEggg
4857757431
merge list menu and list indicators
2018-05-19 11:36:31 +02:00
DizzyEggg
1ead30ad40
decompile menu indicators
2018-05-19 10:54:02 +02:00
DizzyEggg
303c9f0917
start menu indicators decomp
2018-05-16 22:16:22 +02:00
DizzyEggg
0cf3836a03
decompile menu helpers
2018-05-15 20:22:19 +02:00
DizzyEggg
7735fb2ad3
start menu helpers decomp
2018-05-14 23:03:40 +02:00
Diegoisawesome
23b050a99e
Update naked attribute and ASM_DIRECT to NAKED macro
2018-05-11 17:24:32 -05:00
PikalaxALT
5539e282a3
through sub_80DB798
2018-05-11 10:51:38 -04:00
PikalaxALT
8d0da7d8e0
Propagate ASM_DIRECT --> NAKED renaming
2018-05-11 09:41:32 -04:00
PikalaxALT
4488bbe9e6
Merge branch 'master' into contest
2018-05-11 09:25:26 -04:00
PikalaxALT
c15b50ac68
through prints_contest_move_description
2018-05-11 08:44:21 -04:00
Diegoisawesome
4e2886db81
Use song constants
2018-05-11 00:33:32 -05:00
Diegoisawesome
2b6d2dfadd
Merge branch 'master' of https://github.com/pret/pokeemerald
2018-05-10 18:38:24 -05:00
Diegoisawesome
416d67c832
Finish porting/decompiling field_effect.c
2018-05-10 18:36:57 -05:00
PikalaxALT
9bee601b16
through sub_80DB174
2018-05-10 19:28:52 -04:00
PikalaxALT
508a8e5182
through sub_80DAFA0
2018-05-10 18:16:58 -04:00
PikalaxALT
7fdebe0d15
through sub_80DAE0C
2018-05-10 17:54:30 -04:00
PikalaxALT
dfc83cf28f
Merge branch 'master' into contest
2018-05-10 09:47:12 -04:00
Diegoisawesome
80062972ae
Begin porting field_effect
2018-05-10 03:02:33 -05:00
golem galvanize
13efa1ef62
fixing conflicts
2018-05-10 03:34:36 -04:00
golem galvanize
d31600e70e
finish decompiling pokedex
2018-05-10 03:30:42 -04:00
PikalaxALT
4470f77b3d
Merge branch 'master' into mauville_old_man
2018-05-09 15:30:21 -04:00
Diegoisawesome
279276c539
Fix capitalization on filename
2018-05-09 05:14:24 -05:00
Diegoisawesome
b570f87152
Merge master from pret
2018-05-09 05:10:23 -05:00
Diegoisawesome
d66c1c642c
Port/decompile fieldmap.c
2018-05-09 05:07:56 -05:00
PikalaxALT
5efe8f3a0d
through sub_80DAB8C
2018-05-08 19:00:23 -04:00
PikalaxALT
f6fbecbc41
through sub_80DA874
2018-05-07 20:49:23 -04:00
PikalaxALT
e8bb464de9
through sub_80DA4F4
2018-05-07 19:46:48 -04:00
PikalaxALT
fd1d75ce37
Merge branch 'master' into mauville_old_man
2018-05-07 18:18:00 -04:00
PikalaxALT
61cc1d5574
Rename symbols using Ruby as a reference
2018-05-07 18:11:20 -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
e6cca15232
sub_80D8B38
2018-05-04 18:59:59 -04:00
PikalaxALT
58200616d5
Merge branch 'master' into trader
2018-05-04 17:45:50 -04:00
PikalaxALT
f05acd88d5
sub_80D8A88
2018-05-03 22:29:53 -04:00
PikalaxALT
210cedd077
through sub_80D883C
2018-05-03 21:01:22 -04:00
PikalaxALT
8aa462cd74
through sub_8121178
2018-05-03 18:05:07 -04:00
PikalaxALT
876e1eb7cc
through sub_8121064
2018-05-03 17:51:14 -04:00
PikalaxALT
1943118a1e
through sub_8120D34
2018-05-03 17:26:02 -04:00
PikalaxALT
c6115a2fec
through sub_8120C0C
2018-05-03 17:03:52 -04:00
PikalaxALT
0bc7759f9b
through sub_8120748
2018-05-03 13:40:08 -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
7d446a9ef7
through sub_80D8490
2018-05-03 08:51:52 -04:00
PikalaxALT
f9230e80aa
through vblank_cb_battle
2018-05-02 19:59:00 -04:00
PikalaxALT
cae0fb8ec2
through sub_81203FC
2018-05-02 16:57:34 -04:00
PikalaxALT
21c3e7e8e5
through SetMauvilleOldMan
2018-05-02 11:31:58 -04:00
PikalaxALT
4bf0950421
through sub_80D7DE8
2018-05-02 08:43:27 -04:00
PikalaxALT
ef29d17c41
through sub_80D7B24
2018-05-01 21:27:24 -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
b80fb98d9a
make battle records compile
2018-05-01 16:35:38 +02:00
DizzyEggg
cc578fce18
battle records decompiled and documented
2018-05-01 15:54:31 +02: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
golem galvanize
f9331f15ef
decompiled up to sub_80BFCF4
2018-04-30 20:41:17 -04:00
DizzyEggg
9f97646724
make item compile
2018-04-29 15:34:14 +02:00
DizzyEggg
fd40e93cb5
clear item, save and load save files
2018-04-29 14:21:59 +02:00
DizzyEggg
25c669e36b
decompile item
2018-04-29 13:36:26 +02:00
golem galvanize
6a401b5386
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex
2018-04-25 00:28:57 -04: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
2d4ab9f4ac
Updated items.c
...
Working but non-matching
2018-04-23 23:25:03 +01:00
Slawter666
f56067bb63
Update items.c
2018-04-23 22:14:30 +01:00
Slawter666
a04f8f6ee3
Convert item data files to .c (not compiling)
2018-04-23 21:44:46 +01:00
DizzyEggg
dede2cc300
Use DMA large macro in option menu
2018-04-18 21:53:51 +02: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
KDSKardabox
dc759a501b
add braces
2018-04-18 22:17:23 +05:30
KDSKardabox
0bab373f49
Perform requested changes
2018-04-18 22:10:26 +05:30
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
ac7d69eb6e
Done requested changes
2018-04-12 22:36:07 +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
2f96282c7f
cleaner
2018-04-03 00:10:19 +02:00
Edouard Veyrier
b2e8ee836d
sub_81607EC and sub_816082C
2018-04-02 20:06:40 +02:00
Edouard Veyrier
09e29a5cf8
Fix three functions to have the right checksum
2018-04-01 18:22:09 +02:00
golem galvanize
069a7e71fc
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex
2018-03-30 16:49:08 -04:00
golem galvanize
3006ff177b
pushing so I can pull from master
2018-03-30 16:48:30 -04:00
Edouard Veyrier
17b9f5d892
Fix compile error
2018-03-29 15:46:10 +02:00
Edouard Veyrier
cfacd23248
Fix temporarily
2018-03-29 11:56:10 +02:00
KDSKardabox
b74b576418
Fix 2 non-matchings
2018-03-29 10:43:49 +05:30
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
Marcus Huderle
c5f99a723e
Remove s prefix from static functions
2018-03-28 21:26:52 -07:00
Anders Løvig
3f4c717d5c
Rename stuff for more consistency
2018-03-29 02:16:02 +02:00
Anders Løvig
df94a8a77c
Small changes and corrections
2018-03-28 22:43:25 +02:00
Edouard Veyrier
990784a6d9
Improve comments
2018-03-28 21:45:35 +02:00
Anders Løvig
57775a946d
Rename start menu functions
2018-03-28 21:09:27 +02:00
Edouard Veyrier
75b07292c9
Translate first functions of learn move
2018-03-28 19:20:20 +02:00
Anders Løvig
5bc8ee6465
Added static modifers
2018-03-28 15:45:35 +02: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
1f7fb45d0f
Decompile more functions
2018-03-15 16:07:24 +05:30
KDSKardabox
f3b5ed0d12
Decompile more functions & rename some labels
2018-03-13 14:41:39 +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
Diegoisawesome
ae214eca8b
Merge pull request #226 from DizzyEggg/decompile_list_menu
...
Decompile list menu
2018-03-09 15:49:36 -06:00
DizzyEggg
70ec55386c
if
2018-03-09 22:22:00 +01:00
DizzyEggg
db2839bd5b
curly brace
2018-03-09 22:18:58 +01:00
PikalaxALT
9b920bfec3
More renaming
2018-03-07 18:03:13 -05:00
PikalaxALT
b2d8ce10ce
Fix build crash
2018-03-06 21:51:25 -05:00
PikalaxALT
aa2cb6a974
Rename match call assets
2018-03-06 08:52:29 -05:00
DizzyEggg
18d8c9382a
Use EGG_HATCH_LEVEL define
2018-03-06 13:29:10 +01:00
PikalaxALT
b3fb7cfca5
Rename some struct fields
2018-03-04 17:30:59 -05:00
PikalaxALT
565b058545
Make visual alignment of structs more consistent
2018-03-04 17:08:10 -05:00
PikalaxALT
7b9930a0a2
Remaining data in match_call
2018-03-04 16:58:51 -05:00
PikalaxALT
1c67840652
Match call data, 2
2018-03-04 16:44:50 -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
PikalaxALT
44fedd861d
nonmatching sub_81D1B40
2018-03-04 15:36:01 -05:00
DizzyEggg
1771e8b458
make it compile
2018-03-04 20:12:45 +01:00
DizzyEggg
62e849a5df
item menu is done
2018-03-04 20:03:11 +01:00
DizzyEggg
4c3f8ac6c6
start item menu icons decomp
2018-03-04 18:41:07 +01:00
PikalaxALT
30c20bbab6
through sub_81D1B00
2018-03-03 13:41:28 -05:00
PikalaxALT
19a89f2362
nonmatching sub_81D199C
2018-03-03 13:22:38 -05: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
PikalaxALT
e3b078d08f
through sub_81D1914
2018-03-02 21:43:18 -05:00
DizzyEggg
87274b9eed
more list menu work
2018-03-03 01:02:07 +01:00
PikalaxALT
d25a9ffe16
through sub_81D1898
2018-03-02 18:12:23 -05:00
DizzyEggg
ae29f35afd
start decompiling list menu
2018-03-02 16:34:31 +01:00
PikalaxALT
89847427e4
match_call_t; through sub_81D17E4
2018-03-02 08:44:33 -05:00
DizzyEggg
1f052cc08d
unnecessary externs
2018-03-02 10:21:12 +01:00
DizzyEggg
a2458d966c
match hidden power calc
2018-03-01 15:02:44 +01:00
DizzyEggg
edf2ea45b1
merge with master
2018-03-01 10:12:35 +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
PikalaxALT
9abc121fa2
through sub_81D16DC
2018-02-28 22:09:28 -05:00
DizzyEggg
20baa1bc7a
battle tv review changes
2018-03-01 01:05:34 +01:00
DizzyEggg
988f0b7e19
Merge branch 'master' into decompile_battle_link_817C95C
2018-03-01 01:01:18 +01:00
DizzyEggg
b846015343
more battle files cleaning
2018-03-01 00:59:52 +01:00
DizzyEggg
a28dfd6da4
Merge branch 'master' into clear_battle_files
2018-02-28 23:58:29 +01:00
DizzyEggg
fed5f03097
get rid of unnecessary externs
2018-02-28 23:57:08 +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
DizzyEggg
e93da9b1f9
make strings in battle message static
2018-02-28 23:50:25 +01:00
Diegoisawesome
a57e04e14d
Merge pull request #220 from PikalaxALT/trainer_rematch
...
Decompile trainer_rematch
2018-02-28 16:41:54 -06:00
Diegoisawesome
0cd9ba36ce
Merge pull request #224 from DizzyEggg/another_try
...
Fix two nonmatching functions
2018-02-28 13:05:05 -06:00
DizzyEggg
305a4fa744
match two functions
2018-02-28 19:37:48 +01:00
DizzyEggg
85a959f321
clean up files
2018-02-28 13:07:58 +01:00
DizzyEggg
edf9f706c4
decomp blit
2018-02-28 12:56:01 +01:00
DizzyEggg
d29b9d268f
make it compile
2018-02-28 00:18:59 +01:00
DizzyEggg
59ff4aec9b
decompile and document battle tv
2018-02-27 20:40:09 +01:00
