ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 20:17:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,504 Commits 1 Branch 0 Tags 235 MiB
d12a8c10ee
Commit Graph

1386 Commits

Author SHA1 Message Date
Diegoisawesome
81b38c00e4
Merge pull request #466 from melthelesbian/compare_macros 
improve compare macros
 2018-12-23 11:17:30 -06:00
DizzyEggg
efa820469a move data to c 2018-12-23 14:52:47 +01:00
DizzyEggg
6d57a9dfc8 start data converting 2018-12-23 13:52:53 +01:00
Diegoisawesome
ebbe826133
Merge pull request #437 from DizzyEggg/storage 
Pokemon Storage System
 2018-12-22 16:12:27 -06:00
Melody
55005f1588 improve call_if macros 2018-12-21 21:32:45 -05:00
Melody
ac2e4adf2d improve goto_if macros 2018-12-21 20:28:24 -05:00
golem galvanize
314b718471 finish porting ice 2018-12-21 01:37:59 -05:00
DizzyEggg
ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
DizzyEggg
7dcb614cca PSS is done 2018-12-20 22:14:36 +01:00
Diegoisawesome
6ef9671718
Merge pull request #440 from garakmon/fldeff 
Decompile / port fldeff_80F9BCC
 2018-12-19 22:16:59 -06:00
Marcus Huderle
b7ce383a96 Document a bunch of battle anims 2018-12-19 21:19:44 -06:00
Diegoisawesome
48d7c0a7a3
Merge pull request #454 from golemgalvanize/decompile_party_menu 
Decompile party menu
 2018-12-19 19:57:31 -06:00
Melody
5e6ceeb631 update applymovement to remove magic numbers 2018-12-19 14:08:01 -05:00
Marcus Huderle
d2b5a0e83f Convert battle_anim_815A0D4 data to .c 2018-12-18 19:15:59 -06:00
golem galvanize
8781d969ff finish party_menu 2018-12-18 05:38:08 -05:00
Marcus Huderle
c74468fd11 Document a bunch of battle anim stuff 2018-12-17 22:16:17 -06:00
Marcus Huderle
c04ce0ee64 Decompile battle_anim_effects_2.c 2018-12-17 22:16:17 -06:00
DizzyEggg
9ffd0c7382 3.5 asm left 2018-12-17 23:00:08 +01:00
garak
e292d0ca83
Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00
DizzyEggg
aae36b5653 6k left 2018-12-16 21:10:01 +01:00
DizzyEggg
f1421d94c3 Up to sub 0x80ce580 2018-12-15 23:58:47 +01:00
Marcus Huderle
1ca3656d74
Decompile contest_painting.c (#447) 2018-12-15 13:07:07 -06:00
Marcus Huderle
5e92481f51
Merge pull request #443 from Meowsy/misc-renamings 
Misc renamings.
 2018-12-13 21:35:36 -06:00
Marcus Huderle
2c6849bee8
Decompile battle_anim_8170478.c (#445) 2018-12-13 21:33:54 -06:00
Marcus Huderle
170b6ef449
Decompile battle_intro.c (#444) 2018-12-12 23:18:25 -06:00
DizzyEggg
59a69eb627 Storage up to icon palettes 2018-12-12 23:19:50 +01:00
DizzyEggg
c5b5f4bd77 More storage 2018-12-10 23:42:44 +01:00
Meowsy
d3e32ab287 Rename Mauville Man text. 2018-12-10 15:50:10 -05:00
DizzyEggg
c2d8876174 Document PSS functions 2018-12-10 21:36:52 +01:00
Diegoisawesome
bfdfe367e8
Merge pull request #422 from garakmon/frontier_data_1 
Battle tower data
 2018-12-10 11:22:16 -06:00
garak
e1e2132a37 sync fldeff function names with pokeruby 2018-12-09 22:24:54 -05:00
garak
b4312648e2 decompile fldeff_80F9BCC with data 2018-12-09 19:22:59 -05:00
Marcus Huderle
a7722a0b93
Decompile cable_car.c (#438) 2018-12-09 13:41:52 -06:00
DizzyEggg
e0f3de0b74 Start pokemon storage system 2018-12-09 16:44:01 +01:00
DizzyEggg
58c4cec946 decompile field screen 2018-12-08 21:42:36 +01:00
DizzyEggg
5caca7a4d6 Clean up field weather 2018-12-08 19:43:21 +01:00
DizzyEggg
4c23adb5f5 Decompile field weather 2018-12-08 19:05:03 +01:00
DizzyEggg
6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
garak
80c3258504 finish battle tower data except sRubyFacilityClassToEmerald 2018-12-04 12:09:35 -05:00
garak
2c14d6ee6c fix merge conflicts 2018-12-03 16:58:28 -05:00
garak
462e7c8295 begin batle tower data 2018-12-02 23:22:42 -05:00
Melody
eeb6446da4 add more consistent names 2018-12-02 22:36:09 -05:00
Melody
10725def8e trainerbattle_normal → trainerbattle_single 
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
 2018-12-02 15:08:19 -05:00
Melody
bad5323642 cleans up trainer battle scripts 
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
 2018-12-02 15:08:19 -05:00
Melody
862265b73a defines register_matchcall macro 2018-12-02 06:04:59 -05:00
Melody
c557ac61ae adds constants, cleans up callstd and msgbox code 
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
 2018-12-02 03:37:46 -05:00
Marcus Huderle
9dd7f8f214
Decompile pokedex_area_screen.c (#412) 2018-11-30 10:41:03 -06:00
Marcus Huderle
0148e38973
Decompile pokedex_cry_screen.c (#406) 2018-11-28 10:14:32 -06:00
DizzyEggg
7cfe0342f0 Finish frontier data 2018-11-27 22:45:50 +01:00
garak
f316d53c58 Merge branch 'frontier-data' of https://github.com/garakmon/pokeemerald into frontier-data 2018-11-27 13:28:44 -05:00
garak
2707bd9b91 clean frontier data 2018-11-27 13:27:49 -05:00
garak
a636005066
delete createsprite.py 2018-11-27 11:40:29 -05:00
garak
73cce79753 Merge remote-tracking branch 'upstream/master' into frontier-data 2018-11-27 11:35:19 -05:00
garak
091b5194e7 frontier pike and pyramid data 2018-11-27 11:21:48 -05:00
Slawter666
deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Marcus Huderle
fb6120da5b Fixup some names 2018-11-25 15:50:54 -06:00
Marcus Huderle
72f0a079a9 Decompile all of battle_anim_utility_funcs 2018-11-19 09:37:25 -06:00
DizzyEggg
4e37723288 Document Battle Pyramid 2018-11-18 17:52:22 +01:00
DizzyEggg
eb66b60f38 Begin battle pyramid 2018-11-17 15:30:34 +01:00
Diegoisawesome
032dd251e6
Merge pull request #383 from garakmon/createsprite 
Update createsprite macro and rename BANK to BATTLER
 2018-11-15 14:45:13 -06:00
Slawter666
6fcf878e2f Tidy up header files 2018-11-13 22:28:46 +00:00
garak
c6833c903c remove extra macro and shorten names 2018-11-13 16:19:52 -05:00
garak
269aebaca7 update createsprite macro and rename BANK to BATTLER 2018-11-13 15:35:46 -05:00
Slawter666
1d46507110 Move field effects enum to defines 2018-11-13 14:19:04 +00:00
DizzyEggg
b5ea69cf74 Fix conflicts 2018-11-12 19:22:23 +01:00
DizzyEggg
69683f9572 Decompile Battle Palace 2018-11-12 15:41:19 +01:00
Slawter666
1b895ff52c Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-11-12 14:14:50 +00:00
DizzyEggg
d5abd7b696 Document Battle Pie 2018-11-12 14:36:31 +01:00
DizzyEggg
a4235c9ff8 Document battle arena 2018-11-11 18:33:16 +01:00
DizzyEggg
81410fee17 Factory done 2018-11-11 16:44:27 +01:00
Diegoisawesome
18839a4872 Merge remote-tracking branch 'pret/master' into script_menu 2018-11-06 20:20:56 -06:00
Diegoisawesome
054a015c95 Finish decompiling/porting script_menu 2018-11-06 20:13:40 -06:00
Diegoisawesome
7dd4ed7060 r5/r6 swap on sub_80E2578 2018-11-05 14:45:54 -06:00
DizzyEggg
0bb51037d7 Finish frontier util 2018-11-01 21:31:10 +01:00
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
Diegoisawesome
c8ef69a00d
Merge pull request #372 from garakmon/sprite-tags 
Synchronize sprite tags
 2018-10-30 11:26:44 -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
0e6fbbfe09 Make battle tower compile 2018-10-27 00:04:18 +02:00
DizzyEggg
52be8eeaf1 Merge branch 'master' into battle_tower 2018-10-26 23:55:36 +02:00
garak
7747a891a2 finish 80FE840 data (actually) 2018-10-25 18:59:05 -04:00
garak
de90ce9123 finish 80FE840 data (almost) 2018-10-25 17:46:23 -04:00
DizzyEggg
1efdaebe23 finish decompiling battle tower 2018-10-25 21:27:10 +02:00
garak
17c26fae1a fire, electric, ice data 2018-10-24 20:01:40 -04:00
garak
22a0b58e57 effects_2 and water data 2018-10-24 15:52:21 -04:00
garak
2f4b00e34b finish effects_1 data 2018-10-23 12:17:31 -04:00
garak
68814c42de begin 80FE840 data 2018-10-23 08:25:51 -04:00
DizzyEggg
b330bdba51 More and more battle tower 2018-10-22 19:22:57 +02:00
garak
6cf39e8a6e clean up sprite tags 2018-10-22 10:51:40 -04:00
garak
d267fcbfb1 name remaining tags 2018-10-22 10:36:43 -04:00
garak
2b9fd18dd4 battle_anims.s data to C 2018-10-21 22:30:20 -04:00
garak
f2363f5982 more tag names 2018-10-21 19:30:27 -04:00
garak
7a9c7e5f06
Merge branch 'master' into sprite-tags 2018-10-21 15:12:18 -04:00
garak
2bb286ab4e begin ANIM_TAG port 2018-10-21 15:07:10 -04:00
DizzyEggg
0ab27e44b1 more tower, fail 2018-10-21 20:13:12 +02: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
Diegoisawesome
2a3ba78831
Merge pull request #369 from garakmon/pan-constants 
Use sound pan constants in data/battle_anim_scripts.s
 2018-10-19 20:27:54 -05:00
garak
ecd482fa2c fix merge conflicts in battle_anim_scripts 2018-10-19 16:19:36 -04:00
garak
38fcc46abb Merge remote-tracking branch 'upstream/master' into pan-constants 2018-10-19 16:05:14 -04:00
garak
901f3ff557 use sound panning constants in battle_anim_scripts 2018-10-19 15:57:19 -04: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
garak
1441ee6bc3 finish event object flags 2018-10-19 13:04:47 -04:00
garak
cb5981cdf2 name more event flags 2018-10-18 21:32:21 -04:00
garak
c27043bd3c more event flags 2018-10-18 15:28:59 -04: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
garak
7d88b9647f
Merge branch 'master' into event-flags 2018-10-17 12:30:45 -04:00
garak
ff97873c30 label temp flags, test replace script 2018-10-17 12:25:12 -04:00
garak
624a7552b6 use event flags in event scripts 2018-10-17 09:05:22 -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
Deokishisu
b52b05368c
Fix "Vigaroth" misspelling in May's House 1F 2018-10-16 12:08:17 -04:00
Deokishisu
e377c323c4
Fix "Vigaroth" misspelling in Brendan's House 1F 2018-10-16 12:07:47 -04:00
Diegoisawesome
a9abb930aa
Merge pull request #352 from huderlem/shop 
[WIP] Shop
 2018-10-14 19:03:48 -05:00
Diegoisawesome
7f211b2588
Merge pull request #359 from Slawter666/label_field_effect_helpers 
Label field_effect_helpers.c
 2018-10-14 18:37:11 -05:00
Deokishisu
bf2063cc1a Update All EVENT_OBJ_GFX References 
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
 2018-10-14 19:09:18 -04: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
d60e4e23f8
Merge pull request #25 from Slawter666/apprentice-data 
Move apprentice data to C
 2018-10-14 16:28:27 +02:00
DizzyEggg
7952cfeba5 document more of apprentice 2018-10-14 16:27:48 +02:00
Slawter666
f08b56d645 Move apprentice data to C 2018-10-14 15:26:13 +01: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
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
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
DizzyEggg
413e26e83d port 80d51ac 2018-10-07 17:45:37 +02:00
DizzyEggg
61343d5069 Decompile battle_anim_80A9C70 2018-10-07 15:39:46 +02:00
DizzyEggg
8c834b9ae8 battle anim 80a5c6c decompiled 2018-10-07 12:32:20 +02:00
DizzyEggg
54fc92bc92 Start porting ruby battle anim file 2018-10-06 23:04:53 +02:00
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims 
Document battle animation scripts
 2018-10-06 08:20:41 -05:00
DizzyEggg
17c5b4089a Label most of the anim tags 2018-10-06 09:37:52 +02:00
Tetrable
e80a53060b Start anim tags 2018-10-05 23:00:07 +01:00
DizzyEggg
611360c29e calledattack to calledmove 2018-09-22 19:08:41 +02:00
DizzyEggg
e362c06aea gRandomMove to gCalledMove 2018-09-22 18:41:00 +02:00
DizzyEggg
66fd9b2ddf Label trainer hill battle type 2018-09-20 22:00:00 +02:00
Marcus Huderle
f2a76b54bd Re-dump tileset images as RGB-indexed, rather than greyscale 2018-09-16 11:07:48 -05:00
DizzyEggg
4d2637883a Slot machine is decompiled. 2018-09-15 23:19:37 +02:00
DizzyEggg
db248dada2 slot machine is decompiled 2018-09-15 22:59:45 +02:00
DizzyEggg
0547e260a4 More of slot machine 2018-09-15 18:01:20 +02:00
DizzyEggg
2a7811456a Add anim tag sprite defines 2018-09-15 00:30:20 +02:00
DizzyEggg
a08d9dd451 Merge branch 'master' into anims 2018-09-12 22:59:04 +02:00
DizzyEggg
8a81bd1bce Sync battle anim labels with pokeruby 2018-09-12 22:58:03 +02:00
Diegoisawesome
095cbbc5c2
Merge pull request #321 from Slawter666/data 
Move more data to C
 2018-09-11 22:10:26 -05:00
Slawter666
f40fa37398 Move battle_bg data to C 2018-09-11 23:37:47 +01:00
Slawter666
991151f461 Move item_use data to C 2018-09-11 03:04:19 +01:00
Slawter666
3c16d8c598 Move braille_puzzles data to C 2018-09-11 02:17:21 +01:00
Slawter666
b6ee8823f0 Move field_special_scene data to C 2018-09-11 02:04:03 +01:00
Slawter666
bcea321494 Finish converting data2b data 2018-09-11 01:35:47 +01:00
DizzyEggg
10b479a3ca Document battle animation scripts. 2018-09-10 21:19:19 +02:00
DizzyEggg
b87856b58e Battle Factory is decompiled and documented. 2018-09-10 01:01:39 +02:00
Slawter666
135e98a824 Move battle factory data to C 2018-09-09 16:06:35 +01:00
Slawter666
1ba17e1666 Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data 2018-09-09 15:51:13 +01:00
DizzyEggg
6454740587 More battle factory 2018-09-09 13:12:26 +02:00
Diegoisawesome
cf8f73bde1
Merge pull request #314 from Slawter666/data 
Convert data to C
 2018-09-07 11:39:07 -05:00
Marcus Huderle
fa9d1759bd checkpoint 2018-09-06 11:37:45 -05:00
Slawter666
9ad7dc9fd7 Move remaining field_player_avatar data across 2018-09-06 12:02:37 +01:00
Slawter666
26c91f1502 Move field_player_avatar data to C 2018-09-06 03:11:33 +01:00
Diegoisawesome
f8f7a8e300
Merge pull request #304 from Slawter666/graphics 
Move data from graphics.s to C
 2018-09-05 20:32:23 -05:00
Slawter666
9350ac0a74 Move battle_pyramid_bag data to C 2018-09-06 01:24:11 +01:00
Slawter666
07c2882390 Move starter_choose data to C 2018-09-06 00:47:29 +01:00
Slawter666
5656ceab6c Move graphics to src/data/graphics 2018-09-05 23:53:54 +01:00
DizzyEggg
75384546b5 More factory decomp and documentation. 2018-09-05 23:30:15 +02:00
DizzyEggg
44ba432dad Label various battle scripts 2018-09-01 20:00:13 +02:00
DizzyEggg
ead21250a6 Label all battle ai scripts 2018-09-01 19:05:06 +02:00
DizzyEggg
917b32ffbe Finish decompiling pyramid bag. 2018-08-30 20:10:57 +02:00
Diegoisawesome
8e5c72766c
Merge pull request #300 from DizzyEggg/decompile_battle_frontier_1 
Decompile battle_dome
 2018-08-29 14:13:39 -05:00
Slawter666
e30c2251ce Convert more of data2b 2018-08-27 00:26:54 +01:00
DizzyEggg
ddd4733de3 rename battle pyramid to battle pyramid bag 2018-08-26 17:54:58 +02:00
Slawter666
69c20f18ac Convert battle dome data to C 2018-08-26 13:40:36 +01:00
DizzyEggg
2b7c138cbe Some labels 2018-08-25 21:04:12 +02:00
DizzyEggg
447e65860c Merge branch 'master' into decompile_battle_frontier_1 2018-08-25 20:02:09 +02:00
DizzyEggg
edcf04b665 Document battle dome. 2018-08-25 19:59:47 +02:00
Slawter666
6b145ed77c Move data from graphics.s to C 2018-08-24 04:21:07 +01:00
Slawter666
ed24233274 Convert more of data2b.s to C 2018-08-22 23:03:44 +01:00
Slawter666
4db5ef3ae6 Convert more data 2018-08-22 21:41:34 +01:00
Slawter666
ef6a3c2278 Move some data from data2b.s to C 2018-08-22 14:34:36 +01:00
DizzyEggg
5da12f2b21 battle dome - more work 2018-08-19 22:26:07 +02:00
DizzyEggg
e4649245ba this file is too much 2018-08-18 19:52:25 +02:00
DizzyEggg
0bfe894566 Merge with master 2018-08-16 22:53:01 +02:00
Diegoisawesome
13dc7a4170 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-15 16:22:54 -07:00
Diegoisawesome
ac3f4fd994 Continue documentation and cleanup of pokemon_summary_screen 2018-08-15 11:51:47 -07:00
DizzyEggg
92c4fc6345 Contest AI clean-up 2018-08-15 11:50:18 +02:00
Diegoisawesome
332a8bcb1d Extract rodata for unk_pokedex_area_screen_helper 2018-08-14 22:37:59 -07:00
Diegoisawesome
a07d69d7c2 Finish pokemon_summary_screen 2018-08-14 22:00:35 -07:00
DizzyEggg
1a0e6f7aed match contest effect 2018-08-13 21:24:11 +02:00
DizzyEggg
0d68af7f06 copy contest effect from ruby 2018-08-12 23:20:17 +02:00
Diegoisawesome
9a73a47ddd Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 12:55:21 -07:00
Diegoisawesome
2dd5fc23d4 Prepare learn_move for merge 2018-08-12 12:54:07 -07:00
Diegoisawesome
25832810f6
Merge pull request #288 from DizzyEggg/slot_machine 
Port a little bit of slot machine
 2018-08-12 12:27:23 -07:00
Diegoisawesome
6bb761a711
Merge pull request #277 from atasro2/player_field_avatar 
decompile a portion of field_player_avatar.s
 2018-08-12 12:09:09 -07:00
Diegoisawesome
26e18f2292
Merge pull request #289 from DizzyEggg/contests 
Pikalax's contests
 2018-08-12 12:04:53 -07:00
MCboy
1bc93c5a66
Merge branch 'master' into player_field_avatar 2018-08-12 23:26:00 +04:30
DizzyEggg
7dac22314e Decompile a bit of pokemon storarage system 2018-08-12 16:40:31 +02:00
DizzyEggg
957dcd01b3 merge with master 2018-08-12 12:11:35 +02:00
Diegoisawesome
18d5186630 Merge remote-tracking branch 'garakmon/heal-loc-2' 2018-08-11 16:57:46 -07:00
Diegoisawesome
cf9518f237 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-11 16:32:03 -07:00
Diegoisawesome
cb9127ccaf Revert "Rename some specials" 
This reverts commit 658f9351fe.
 2018-08-11 15:16:41 -07:00
DizzyEggg
df5009cb3e Move move descriptions to C 2018-08-12 00:03:19 +02:00
Diegoisawesome
658f9351fe Rename some specials 2018-08-11 14:59:43 -07:00
Diegoisawesome
b54793be91 Finish decompiling field_specials 2018-08-11 14:51:54 -07:00
DizzyEggg
537ebd36ac Merge contests with master 2018-08-11 19:04:28 +02:00
DizzyEggg
0e0d103044 port more of slot machine 2018-08-11 18:47:56 +02:00
Diegoisawesome
1e0f3ec433 Continue decompiling field_specials 2018-08-10 14:07:23 -07:00
garak
c3512e3b39 port larger heal location changes from poke ruby pr 2018-08-10 10:45:15 -04:00
Diegoisawesome
12ff59f9c1 Continue decompiling field_specials 2018-08-10 00:42:06 -07:00
Diegoisawesome
bad170b0cb Continue decompiling field_specials 2018-08-08 23:53:21 -07:00
Diegoisawesome
90896e38c9 Begin porting/decompiling field_specials 2018-08-08 01:37:12 -07:00
DizzyEggg
3d5f512aec
Use constant in a battle script. 2018-08-03 18:07:45 +02:00
DizzyEggg
9febcd3a0a Document a bit of atk47 2018-07-29 15:51:08 +02:00
DizzyEggg
68145cd002 Document atk48 2018-07-29 15:33:16 +02:00
Diegoisawesome
7270e73fee Move strings to C 2018-07-25 01:15:36 -07:00
Diegoisawesome
e92e2cb0aa Merge branch 'master' of github.com:pret/pokeemerald 2018-07-24 21:18:36 -07:00
Diegoisawesome
156fb472e1 Clean up files and add entries to charmap 2018-07-24 21:18:23 -07:00
Diegoisawesome
5883f867f0
Merge pull request #278 from vblm12/trainer_data 
Move some trainer data into c structs
 2018-07-24 18:58:56 -07:00
MCboy
1b3d7a5bef
Update field_player_avatar.s 2018-07-24 17:04:02 +04:30
DizzyEggg
1e9143e0b2 merge union room with master 2018-07-22 13:14:58 +02:00
DizzyEggg
c9d486a5d3 make union room compile i guess 2018-07-22 12:49:49 +02:00
vblm12
3d04105488 Remove unnecessary files. 2018-07-21 01:51:44 -05:00
vblm12
29276cc76c Move some trainer data from data2b.s to c structs. 2018-07-20 22:14:31 -05: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
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
PikalaxALT
6ae395a636 Merge branch 'master' into contest 2018-05-24 10:26:55 -04: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
PikalaxALT
4488bbe9e6 Merge branch 'master' into contest 2018-05-11 09:25:26 -04: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
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
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
5efe8f3a0d through sub_80DAB8C 2018-05-08 19:00:23 -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
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