DizzyEggg
81b29ae7c1
Merge with pokeemerald
2018-07-16 22:45:06 +02:00
DizzyEggg
988e00b8e4
Small change
2018-07-16 21:56:11 +02:00
DizzyEggg
0852cba111
Fix dynamic move power moves, get rid of gDynamicBasePower'
...
'
2018-07-16 21:42:03 +02:00
DizzyEggg
ea5ffa3375
Merge with master
2018-07-16 20:23:05 +02:00
Diegoisawesome
07ef762770
Merge pull request #275 from Diegoisawesome/master
...
Document list_menu.c and main_menu.c
2018-07-15 04:43:03 -07:00
Diegoisawesome
731d6d59bc
Document list_menu.c and main_menu.c
2018-07-15 04:30:37 -07:00
DizzyEggg
5a38bb61db
Basic damage calc is ready.
2018-07-14 22:56:03 +02:00
DizzyEggg
2ebf14a83d
Get rid of scripting dmg multiplier
2018-07-14 18:58:45 +02:00
DizzyEggg
baf172d605
Prepare damage calc huge changes
2018-07-14 18:44:38 +02:00
DizzyEggg
939127bfff
Important battle util functions
2018-07-14 16:41:14 +02:00
DizzyEggg
3a10ae9a94
Crit changes accomodated to ai scripts
2018-07-14 12:54:12 +02:00
DizzyEggg
2293d1ddbc
Get rid of duplicate bs command jumpiftype
2018-07-14 12:02:29 +02:00
DizzyEggg
fe15e56f31
Add Gen4 move names and fairy type name
2018-07-14 10:57:34 +02:00
DizzyEggg
c9d1ee3c4a
Move high crit to a flag and update move table
2018-07-14 10:11:38 +02:00
Marcus Huderle
94650495c6
Use map battle scene constants in map headers
2018-07-12 22:45:41 -05:00
Marcus Huderle
546819bc72
Use map type constants in map headers
2018-07-12 22:39:38 -05:00
Marcus Huderle
d53e8137cd
Use weather constants in map headers
2018-07-12 22:15:35 -05:00
Marcus Huderle
d5eb94330a
Use region map section constants in map headers
2018-07-12 21:47:04 -05:00
Marcus Huderle
7d375972ba
Sync bg_event macros with pokeruby
2018-07-11 11:12:26 -05:00
Marcus Huderle
8ffd7a70fc
Use movement type constants in object_event macros
2018-07-10 18:04:51 -05:00
DizzyEggg
9892298645
Merge branch 'master' into final_battle_files_touches
2018-07-07 14:11:04 +02:00
Diegoisawesome
5189442bcc
Merge branch 'decompile_cut' of git://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_cut
2018-07-05 20:32:12 -07:00
DizzyEggg
c556358e47
label multiuse sprite template functions
2018-07-01 15:28:57 +02:00
DizzyEggg
f35c0abe80
merge with battle tent update
2018-07-01 12:16:52 +02:00
DizzyEggg
d2e47323fe
document frontier related
2018-07-01 11:15:42 +02:00
DizzyEggg
2d0be91217
Move all trainer defines to trainers.h and identify frontier brain trainer id
2018-06-30 18:55:34 +02:00
DizzyEggg
15fe5a031b
Merge branch 'master' into decompile_battle_tent
2018-06-30 14:43:41 +02:00
DizzyEggg
30c85a5128
more battle documentation
2018-06-30 14:12:17 +02:00
DizzyEggg
272b98da6c
document party status summary
2018-06-28 21:06:32 +02:00
Marcus Huderle
91ee3221b3
Formatting
2018-06-20 19:54:21 -05:00
Marcus Huderle
5e00c0bfcf
Fix map constants
2018-06-20 19:54:21 -05:00
Marcus Huderle
ed8b006e67
Rename map-layout-related things
2018-06-20 19:54:21 -05:00
Marcus Huderle
135a11e50e
Move events and scripts into map dirs
2018-06-20 19:54:21 -05:00
Marcus Huderle
89d35e82a2
Move 'map attributes' into 'layouts'
2018-06-20 19:54:21 -05:00
DizzyEggg
caa36b530a
label and document battle windows
2018-06-17 16:48:58 +02:00
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
Marcus Huderle
f807eb1f2d
Split out movement radius in object_event macro
2018-06-15 07:49:21 -05:00
Marcus Huderle
2807abe3ba
Remove filler bytes from object_event macro
2018-06-15 07:49:21 -05:00
Marcus Huderle
acc1a5d446
Get all map constants from include/ rather than constants/
2018-06-15 07:49:21 -05: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
e01dd90bb3
Update applymovement actions to reflect movement action names
2018-06-13 18:19:19 -05:00
Marcus Huderle
4d13e3394a
Bring all movement function names up-to-date with pokeruby
2018-06-13 17:51:26 -05:00
Avara
223ee357f7
battle dome palette label update to graphics.s
2018-06-12 12:12:29 +01: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
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
38a126df66
Rename field_map_obj to event_object_movement
2018-06-11 08:46:33 -05:00
DizzyEggg
e95b1156d2
more progress
2018-06-03 09:37:01 +02:00
Diegoisawesome
0b09575fd4
Merge pull request #249 from golemgalvanize/decompile_pokedex
...
Decompile pokedex
2018-06-01 00:02:46 -07: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
ff0c615870
decompile rom_8034C54
2018-05-27 23:26:01 +02:00
DizzyEggg
b051cbaaab
more record mixing decomp
2018-05-25 21:00:41 +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
0978cc60a1
change map event var names to pokeruby ones
2018-05-19 19:20:32 +02: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
1ead30ad40
decompile menu indicators
2018-05-19 10:54:02 +02:00
DizzyEggg
0cf3836a03
decompile menu helpers
2018-05-15 20:22:19 +02: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
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
PikalaxALT
4470f77b3d
Merge branch 'master' into mauville_old_man
2018-05-09 15:30:21 -04: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
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
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
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
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
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
f9a2f6c4a2
start decompiling battle records
2018-05-01 12:38:55 +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
a04f8f6ee3
Convert item data files to .c (not compiling)
2018-04-23 21:44:46 +01:00
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
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
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
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
57775a946d
Rename start menu functions
2018-03-28 21:09:27 +02:00