Commit Graph

4909 Commits

Author SHA1 Message Date
GriffinR
5e01871f8b Document Trainer Hill 2019-11-16 13:02:35 -06:00
GriffinR
2c3726a328 Document contest strings 2019-11-16 12:50:01 -06:00
GriffinR
248b85c3cb Document Frontier Exchange Corner scripts 2019-11-16 12:00:35 -06:00
GriffinR
57a66bb22d Document Battle Frontier lounges 2019-11-16 11:37:34 -06:00
huderlem
0a43f2ce53
Merge pull request #899 from GriffinRichards/doc-scriptclean
Document interview and TV scripts, and misc script clean up
2019-11-16 11:34:47 -06:00
GriffinR
fc3783b739 WIP Document apprentice 2019-11-16 12:28:49 -05:00
GriffinR
eb38922e42 Fix mislabeled SS Tidal movements 2019-11-14 18:07:56 -06:00
GriffinR
0f53aeb19b Document SS Tidal scripts 2019-11-14 18:07:56 -06:00
GriffinR
00f22b6400 Document remaining routes (104, 119-123) 2019-11-14 17:51:02 -06:00
GriffinR
ff7e11c0b0
Merge branch 'master' into doc-scriptclean 2019-11-13 19:25:41 -05:00
GriffinR
ef8370566f Document Contest scripts 2019-11-13 18:20:55 -06:00
GriffinR
af83b41dd1 Document Contest Hall berry blenders and misc 2019-11-13 18:20:55 -06:00
GriffinR
7455bd9b9a Document interview and TV scripts, and misc script clean up 2019-11-12 14:20:05 -05:00
DizzyEggg
e82fc06e08 Match ConvertImageProcessingToGBA 2019-11-12 17:25:02 +01:00
Marcus Huderle
8e65f0188f Rename contest_painting_effects to image_processing_effects 2019-11-10 16:37:26 -06:00
Marcus Huderle
1ed3af66eb Document contest painting image processing effects 2019-11-10 16:37:26 -06:00
GriffinR
a3ee92a4e7 Document some frontier util funcs 2019-11-10 16:37:14 -06:00
DizzyEggg
791ed999d9 Merge 2019-11-10 12:40:11 +01:00
huderlem
ed76620d28
Merge pull request #880 from GriffinRichards/doc-trickhouse
Document Trick House scripts
2019-11-09 08:48:49 -06:00
GriffinR
8702972067 Document Sky Pillar outside 2019-11-09 08:41:43 -06:00
Thomas Winwood
a727c16012 Use descriptive constant for ScriptGiveMon call 2019-11-09 08:37:45 -06:00
GriffinR
a38bff8c17 Document Slateport scripts 2019-11-09 08:37:06 -06:00
huderlem
906a1ec4ab
Merge pull request #883 from GriffinRichards/fix-colossname
Fix Battle Colosseum names
2019-11-08 17:24:05 -06:00
GriffinR
9140594b23
Merge branch 'master' into doc-littleroot 2019-11-08 03:07:50 -05:00
GriffinR
e19b9c9d46 Resolve Littleroot merge conflict 2019-11-08 03:07:19 -05:00
GriffinR
bef24a45f0 Document Littleroot scripts 2019-11-08 02:47:55 -05:00
huderlem
030784dece
Merge pull request #882 from GriffinRichards/doc-mauville
Document Mauville and New Mauville scripts
2019-11-07 20:22:56 -06:00
huderlem
1ceee6ef70
Merge pull request #884 from GriffinRichards/doc-halloffame
Document a few towns/cities
2019-11-07 19:55:19 -06:00
huderlem
662a9915cf
Merge pull request #881 from GriffinRichards/doc-caves
Document cave scripts
2019-11-07 18:29:48 -06:00
Marcus Huderle
01e6fb6dd0 Document some battle_bg-related things 2019-11-07 18:24:04 -06:00
GriffinR
bae4a586d8 Document Hall of Fame scripts 2019-11-07 13:26:53 -05:00
GriffinR
35ed8de51b Fix Battle Colosseum names 2019-11-07 12:37:11 -05:00
GriffinR
c132989679 Document Mauville scripts 2019-11-07 10:18:56 -05:00
GriffinR
43b7fd741a Document Game Corner scripts 2019-11-07 09:41:59 -05:00
GriffinR
3a00b66407 Document cave scripts 2019-11-07 07:57:51 -05:00
GriffinR
2b944fd721
Merge branch 'master' into doc-trickhouse 2019-11-06 19:49:14 -05:00
GriffinR
25d026aded Document Trick House scripts 2019-11-06 19:41:19 -05:00
GriffinR
fbc3eee1f2 Document Fossil Maniac and Berry Master route houses 2019-11-06 17:01:23 -06:00
GriffinR
58dcd6d99d Clean up mystery event msg 2019-11-06 16:38:02 -06:00
GriffinR
d9da932dad Document Rustboro scripts 2019-11-05 16:43:57 -06:00
GriffinR
5ef300c10b Document dept store 2019-11-04 16:49:06 -06:00
GriffinR
5c627518b3 Rename Grunts to use location-specific names 2019-11-04 16:45:00 -06:00
huderlem
a4b4ecd470
Merge pull request #787 from GriffinRichards/rename-tablecmds
Rename table cmds
2019-11-04 16:31:27 -06:00
tustin2121
d4582cb874 Requested change from pkmn to mon 2019-11-04 16:25:46 -06:00
Tustin2121
2fe9d7a81f Document showing pokemon in credits 2019-11-04 16:25:46 -06:00
GriffinR
5f1fcdd023 Document aqua/magma area scripts 2019-11-01 17:22:45 -05:00
GriffinR
dd01942c4f Document aqua/magma hideout scripts 2019-11-01 17:22:45 -05:00
huderlem
6eaac9ea9d
Merge pull request #863 from GriffinRichards/doc-partymenu
Document party menu
2019-10-31 21:36:56 -05:00
tustin2121
218fcd99b3 Itemfinder code should use flag constant 2019-10-31 21:34:03 -05:00
GriffinR
27169f634b Review changes for party menu doc 2019-10-31 21:33:01 -04:00
GriffinR
8055548fa4 Document legendary scripts 2019-10-31 18:28:34 -05:00
GriffinR
b1ea2592c3
Merge branch 'master' into doc-partymenu 2019-10-31 14:22:51 -04:00
GriffinR
b33db9b96c Move party menu data 2019-10-31 14:16:43 -04:00
GriffinR
aec7eb6089 Clean up party_menu doc 2019-10-31 14:11:55 -04:00
GriffinR
e01ec84837 Document party_menu second pass 2019-10-31 03:25:56 -04:00
GriffinR
93e2851fc1 Document players_house.inc and Littleroot house scripts 2019-10-30 17:51:35 -05:00
GriffinR
5fd44d1e74 Rename some STAT_CHANGE macros 2019-10-26 11:53:00 -04:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
GriffinR
ca2c6fa9b1 Document pc_transfer.inc 2019-10-22 17:57:28 -05:00
GriffinR
9a86769847 Document obtain_item.inc 2019-10-22 17:57:28 -05:00
GriffinR
c0aaa01424 Document flash.inc 2019-10-22 17:57:28 -05:00
GriffinR
5b845bb0a0 Review changes for #852 2019-10-21 17:21:53 -05:00
GriffinR
973e6f9667 Document mauville_man.inc 2019-10-21 17:21:53 -05:00
Sewef
64cf2d70fa battle_anim_effects_3 (3) 2019-10-21 18:36:45 +02:00
Sewef
b24e7a5933 battle_anim_effects_3 (2) 2019-10-21 18:29:59 +02:00
Sewef
c8e0e89f8e battle_anim_effects_3 2019-10-21 18:19:07 +02:00
Sewef
dcefd3c593
Update battle_anim_effects_3.c 2019-10-21 18:01:18 +02:00
Sewef
41e952a668 battle_anims_effects_2
Fixes
2019-10-20 12:29:08 -05:00
Sewef
e9675bdd24 battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
def7a4a18a more battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
8531a17e10 battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
e90c708383 battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
3b0d9e134f battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
49ad6da8fb starting battle_anim_effects_2 2019-10-20 12:29:08 -05:00
GriffinR
ac399ade4a Document safari zone scripts 2019-10-20 09:53:21 -05:00
GriffinR
0db188b487 Clean up berry_tree.inc and misc adjacent documentation 2019-10-20 09:46:46 -05:00
DizzyEggg
4d407d22ba Fix merge 2019-10-19 15:52:21 +02:00
DizzyEggg
1d10d44a4d Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-10-19 15:17:45 +02:00
huderlem
cb9f89925f
Merge pull request #841 from GriffinRichards/document-gyms2
Document Petalburg, Fortree, Mossdeep, and Sootopolis Gyms
2019-10-19 08:05:11 -05:00
Sewef
19fb0fb220
Merge branch 'master' into patch-2 2019-10-16 19:35:33 +02:00
Sewef
ed1f5a7455 Conflits 3/2
Nice one, git
2019-10-16 19:32:02 +02:00
Sewef
c280d0e00e Another fix, Conflicts 2/2 2019-10-16 19:26:08 +02:00
Sewef
e7d36a76e1 Forgotten fix, conflits 1/2 2019-10-16 19:21:58 +02:00
Sewef
9dcfc5ba73 Fix labels 2019-10-16 19:10:39 +02:00
GriffinR
b4a9298205
Merge branch 'master' into document-gyms2 2019-10-16 04:22:34 -04:00
GriffinR
0f15264595 Document rotating_tile_puzzle 2019-10-16 04:09:30 -04:00
GriffinR
348bb002a8 Document Gym scripts first half 2019-10-15 17:09:47 -05:00
huderlem
a0b3f5d9e3
Merge pull request #833 from GriffinRichards/doc-inc2
Document .incs split from event_scripts Round 2
2019-10-15 16:30:27 -05:00
GriffinR
90a05cf824 Finish Mossdeep Gym doc, beging documenting rotating tile puzzle 2019-10-15 05:06:13 -04:00
GriffinR
1b41b8b7ca Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms 2019-10-15 05:05:57 -04:00
Sewef
07ac727c6d Document Oamdata in battle_anim (#838) 2019-10-14 18:26:47 -05:00
GriffinR
928cdf2531
Merge branch 'master' into doc-inc2 2019-10-14 19:25:10 -04:00
huderlem
26962b7725
Merge pull request #830 from GriffinRichards/doc-inc
Document some .incs split from event_scripts
2019-10-14 18:22:35 -05:00
garak
9b9b14ad0a remove empty groups from wild encounter fields json objects 2019-10-14 18:12:03 -05:00
garak
c73e20b6af add subgroups for fishing rods to encounter json 2019-10-14 18:12:03 -05:00
Sewef
8dacb53029 Update battle_anim_effects_1.c 2019-10-14 23:31:29 +02:00
Sewef
975c0ce1d0 Label battle_anim_effects_1 2019-10-14 23:27:12 +02:00
Sewef
65b82d67c9 Revert "More battle_anim_effects_1 labels"
This reverts commit 00331a644a.
2019-10-14 23:22:44 +02:00
Sewef
5a366e8d72 More battle_anim_effects_1 labels 2019-10-14 22:51:45 +02:00
Sewef
00331a644a More battle_anim_effects_1 labels 2019-10-14 22:42:15 +02:00
Sewef
299166edee Document subs & AnimTask in battle_anim_effects_1 2019-10-14 22:08:03 +02:00
Sewef
46f2cc5449 battle_anim_effects_1 main callbacks 2019-10-14 21:17:38 +02:00
Sewef
63b5be9259 Ended battle_anims_effects_1 SpriteTemplates 2019-10-14 21:05:40 +02:00
Sewef
ddd4639b82
Started labelling battle_anim_effects_1 2019-10-13 22:35:31 +02:00
GriffinR
30ef494163
Merge branch 'master' into doc-inc2 2019-10-13 15:44:07 -04:00
GriffinR
a081124a20
Merge branch 'master' into doc-inc 2019-10-13 15:26:44 -04:00
Marcus Huderle
8df4982b3f Merge remote-tracking branch 'upstream/master' into document-trade 2019-10-12 15:39:17 -05:00
GriffinR
4e2be7ff5e Review changes for #835 2019-10-12 15:14:57 -05:00
GriffinR
1b7607bd91 Document cable_club.inc 2019-10-12 15:14:57 -05:00
jiangzhengwenjz
9b81fe1b62 sub_810E520 2019-10-11 20:11:00 -05:00
GriffinR
3514f9dd6b Clean up trade.c doc 2019-10-10 18:46:42 -04:00
GriffinR
07fa82c911 Last non-anim trade.c doc 2019-10-10 03:50:51 -04:00
GriffinR
32aa87c7e1 More trade doc, fix switch indentations 2019-10-09 14:21:29 -04:00
GriffinR
2c062dc764 More trade documentation 2019-10-09 05:56:44 -04:00
GriffinR
d1bcd60b58 Document more trade.c 2019-10-08 20:25:46 -04:00
GriffinR
d8f5e73bb7
Merge branch 'master' into doc-inc 2019-10-07 17:37:04 -04:00
GriffinR
7ba11b7a1b Use VAR_FACING constants 2019-10-07 16:36:02 -05:00
GriffinR
9553ec1d28 Document mevent.inc 2019-10-07 10:34:12 -04:00
GriffinR
0df304d629 Document roulette.inc 2019-10-07 02:00:16 -04:00
GriffinR
81ee8f07ef Document pc.inc and prof_birch.inc 2019-10-07 01:13:34 -04:00
GriffinR
c4deb4db96 Document field_poison 2019-10-06 20:04:30 -04:00
GriffinR
f179ab95c0 Document move tutors 2019-10-06 17:30:17 -04:00
Marcus Huderle
4494b5d4cb Document collision types 2019-10-06 15:48:26 -05:00
Marcus Huderle
799edaf3e6 Document hide/show reflection movement actions 2019-10-06 14:17:34 -05:00
GriffinR
748a1dbdd4 Document cave hole 2019-10-06 14:16:37 -04:00
DizzyEggg
cb6bafcb7f Merge with master 2019-10-06 14:40:12 +02:00
GriffinR
66a68159b1 Continue trade doc 2019-10-05 10:41:37 -04:00
GriffinR
a6847ca1d9 Note overflow in ModifyStatByNature 2019-10-05 09:24:57 -05:00
GriffinR
dadb1cb9f1 More trade/union room doc, incidental party_menu doc 2019-10-04 23:31:25 -04:00
GriffinR
6b556900f8 Move union room data, more trade doc 2019-10-04 17:24:03 -04:00
GriffinR
2b0c944286 Document more of trade 2019-10-04 07:42:45 -04:00
GriffinR
4a7f061885 Document some of trade 2019-10-03 19:39:37 -04:00
GriffinR
c3c8fb40cf Move trade data, some trade.c clean up documentation 2019-10-03 01:16:22 -04:00
PikalaxALT
cb528cb543
Merge pull request #821 from GriffinRichards/document-textinput
Document text input strings
2019-10-02 09:49:26 -04:00
PikalaxALT
0d13a85855
Merge pull request #822 from GriffinRichards/document-fieldspecials
Document a few field specials
2019-10-02 09:22:09 -04:00
PikalaxALT
9317d114a9
Merge pull request #823 from GriffinRichards/constants-strconv
Use STR_CONV constants
2019-10-02 09:18:48 -04:00
GriffinR
c5cb45991b Document PrintItemXAmount 2019-09-30 15:53:24 -04:00
GriffinR
5325835ee7 Use STR_CONV constants 2019-09-30 15:43:44 -04:00
GriffinR
9aed405851 Document a few field specials 2019-09-30 01:42:52 -04:00
GriffinR
a923ae78c3 Add missing page num usage 2019-09-30 00:13:08 -04:00
GriffinR
53bc1bd0d1 Document text input strings 2019-09-30 00:09:29 -04:00
Tustin2121
5007d279fe Review fixes 2019-09-29 16:33:13 -04:00
GriffinR
73b96fe145 Rename CONTACT macros to ON_DAMAGE 2019-09-27 12:27:36 -04:00
PikalaxALT
301822603e
Merge pull request #802 from PikalaxALT/gflib
Gflib and libagbsyscall
2019-09-27 11:34:55 -04:00
PikalaxALT
7b8b5b5c8c Merge branch 'master' into gflib 2019-09-27 09:11:22 -04:00
GriffinR
3bf8129396 Clean up new Cmd macro names 2019-09-27 02:54:28 -04:00
GriffinR
1491b1855b
Merge branch 'master' into document-eventscripts 2019-09-26 15:03:22 -04:00
GriffinR
1016b23918
Merge branch 'master' into rename-tablecmds 2019-09-26 15:02:38 -04:00
Ariel Antonitis
208e1c9689 Removed 'Summary_' prefix. 2019-09-25 20:44:17 -05:00
Ariel Antonitis
ea638b82fa Fixed typo. 2019-09-25 20:44:17 -05:00
Ariel Antonitis
4b7f096bbd Relabeled unknown functions in pokemon_summary_screen.c 2019-09-25 20:44:17 -05:00
GriffinR
37373c1b21 Review changes for #817 2019-09-25 18:46:25 -05:00
GriffinR
4e98a0cc4b Remove Egg parent constants 2019-09-25 18:46:25 -05:00
GriffinR
801ca37f04 Document day_care.inc and related 2019-09-25 18:46:25 -05:00
Marcus Huderle
1ae352bcb6 Cleanup whitespace 2019-09-25 16:45:57 -05:00
jiangzhengwenjz
405384de89 Phase2_Ripple_Func2 2019-09-25 16:45:57 -05:00
jiangzhengwenjz
9aaf498471 CopyTileMapEntry 2019-09-25 16:37:42 -05:00
huderlem
886f043025
Merge pull request #816 from jiangzhengwenjz/ptch-3
get rid of goto in battle_script_commands
2019-09-25 16:31:53 -05:00
GriffinR
de6e1e9ecf Use multi constants from merge 2019-09-23 00:36:49 -04:00
GriffinR
a180d2af49
Merge branch 'master' into document-eventscripts 2019-09-22 12:18:48 -04:00
GriffinR
8e4e344c7d
Merge branch 'master' into document-scriptmenu 2019-09-22 09:45:44 -04:00
GriffinR
80f58f7b24 Document PLAYER_HAS constants, consolidate poke constants 2019-09-22 08:14:22 -05:00
GriffinR
b6dffcf8b7 Clean up script_menu documentation 2019-09-19 19:23:24 -04:00
GriffinR
9fb24bbbce Remainder of script_menu documentation 2019-09-19 18:31:09 -04:00
GriffinR
275695c189 Document more script_menu, lilycove harbor 2019-09-19 17:27:34 -04:00
GriffinR
de0084ef7a Document multichoice ids 2019-09-19 00:56:51 -04:00
GriffinR
b596322ca2 Initial script_menu documentation 2019-09-18 18:57:25 -04:00
GriffinR
58b8d7c297
Merge branch 'master' into document-eventscripts 2019-09-17 18:01:20 -04:00
GriffinR
459fca289c Review changes for #806 2019-09-17 16:50:42 -05:00
GriffinR
5092ad376d Dynamic ordering for options names 2019-09-17 16:50:42 -05:00
GriffinR
1be131f843 Dynamic ordering for options menu 2019-09-17 16:50:42 -05:00
GriffinR
6ab192e739 Review changes for #807 2019-09-17 16:50:17 -05:00
GriffinR
6ab49da811 Clean up field_specials documentation 2019-09-17 16:50:17 -05:00
GriffinR
3dbd375779 Some frontier field_specials documentation 2019-09-17 16:50:17 -05:00
GriffinR
aac9658a8e Document some field_specials data 2019-09-17 16:50:17 -05:00
GriffinR
945d3d3a27
Merge branch 'master' into document-eventscripts 2019-09-17 00:10:23 -04:00
GriffinR
06af24bce5 Use misc ScrCmd constants 2019-09-16 19:44:47 -05:00
GriffinR
340c4e1411 Clean up script_movement documentation 2019-09-16 19:30:36 -05:00
GriffinR
f9a8f44a29 Document script_movement 2019-09-16 19:30:36 -05:00
GriffinR
6c9997a906 Document decor icons 2019-09-16 19:23:21 -05:00
GriffinR
b46c4b6703 more constant usage 2019-09-16 19:21:23 -05:00
GriffinR
85d97542cd Use MAX_MON_MOVES constants 2019-09-16 19:21:23 -05:00
LOuroboros
c6504ebfd4 Oops. I forgot to set the correct description in the Dream Ball's data. 2019-09-16 18:43:51 -03:00
LOuroboros
22e1e53d66 Added missing item data. 2019-09-16 18:04:01 -03:00
GriffinR
f4160ded98 Fix misnamed function 2019-09-16 00:29:59 -04:00
GriffinR
bb236b490d Update BS constants for Cmd rename 2019-09-15 17:58:12 -04:00
tustin2121
711e7d884c Document cave transition code. 2019-09-10 13:43:33 -04:00
PikalaxALT
27aae9da9a Fix modern 2019-09-08 21:41:40 -04:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
GriffinR
9fbcd552de document remainder of secret_base scripts, delete unneeded scripts.incs 2019-09-06 02:12:00 -04:00
PikalaxALT
e87f4f4cc7 Unify TrHillTag struct definitions (variable floors) 2019-09-05 20:48:48 -05:00
PikalaxALT
904bba9e16 NULL_BATTLE_TOWER_POKEMON define 2019-09-05 20:48:48 -05:00
PikalaxALT
e2fbce996e Use designated initializers (C99 feat) 2019-09-05 20:48:48 -05:00
PikalaxALT
f3bed6045e Disassemble data/ereader_screen.s 2019-09-05 20:48:48 -05:00
PikalaxALT
a9918c3b89 Partial refactor of TryWriteTrainerHill_r 2019-09-05 20:48:48 -05:00
PikalaxALT
cb0fa2fdc3 Minor edit to save trainer hill routine 2019-09-05 20:48:48 -05:00
PikalaxALT
b510100503 Port trainer hill sets to C objects 2019-09-05 20:48:48 -05:00
PikalaxALT
8d910465f8 Minor refactor of ereader_helpers.c 2019-09-05 20:48:48 -05:00
Eduardo Quezada D'Ottone
de02805388 Changed names. 2019-09-05 20:42:15 -05:00
Eduardo Quezada D'Ottone
e2689d2a27 Documented Mechadoll answers. 2019-09-05 20:42:15 -05:00
GriffinR
8c6b5648d4 document secret_base_1.inc 2019-09-05 16:16:21 -04:00
PikalaxALT
1e1a4076f0
Merge pull request #798 from GriffinRichards/constants-baction
Use misc battle constants
2019-09-05 09:06:31 -04:00
GriffinR
eb0b73c14e
Use CountAliveMonsInBattle constants 2019-09-04 17:47:29 -04:00
GriffinR
c647a8329f
Use gBattlerPositions constants 2019-09-04 17:45:04 -04:00
GriffinR
4a0cad80b0
Use B_SIDE constants
Also includes a CHAR_X constant use for X items
2019-09-04 17:06:59 -04:00
PikalaxALT
5c7eac7134
Merge pull request #744 from PikalaxALT/remove_tutor_casts
Remove unnecessary tutor learnset casts
2019-09-04 16:51:06 -04:00
PikalaxALT
36723a235a
Merge pull request #735 from garakmon/encounter_json
Add Different Field Info to Wild Encounters JSON
2019-09-04 16:50:39 -04:00
GriffinR
6b04ea0727
Merge branch 'master' into document-eventscripts 2019-09-03 22:22:14 -04:00
GriffinR
5f457dd459
Use B_ACTION constants 2019-09-03 15:08:25 -04:00
GriffinR
5d30304f4e Use OTID constants for CreateMon 2019-08-30 22:13:14 -05:00
tustin2121
cdae0c1444 Change event object graphics pointer table to use explicit indexes
- This makes it easier for future hack makers to rearrange, add, or delete graphic object ids without having to count indexes or keep them in order.
- Porymap will have to be updated, but I have some code for this already in a fork.
2019-08-29 16:44:10 -05:00
jiangzhengwenjz
4f9052cb96 get rid of goto in battle_script_commands 2019-08-28 06:06:17 +08:00
DizzyEggg
91acfb262f Change x defend to x defense 2019-08-25 16:07:15 +02:00
DizzyEggg
d0b9b31390 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-08-25 15:58:57 +02:00
ultima-soul
d3ea25ee7f Synchronize with pokefirered pokedex.c. 2019-08-24 11:17:11 -07:00
GriffinR
869d0eebc0
Rename atk## constants and states 2019-08-23 08:46:21 -04:00
GriffinR
2cb174b4ea
rename BattleAICmd prefix 2019-08-23 08:10:37 -04:00
GriffinR
68905e3961
rename atk## prefixes 2019-08-23 07:55:36 -04:00
Diegoisawesome
8e7abad720
Merge pull request #786 from DizzyEggg/u8
GetAbilityBySpecies's arg from bool8 to u8
2019-08-22 17:45:56 -05:00
DizzyEggg
d09c290eba bool8 to u8 2019-08-22 16:46:33 +02:00
Kevin Mills
f76f395563 use MENU_FIELD_MOVES in sub_81B31B0 2019-08-21 18:20:45 -05:00
GriffinR
4228750e38 more documentation in match_call_data
Documents everything related to UnkStruct_08625388, names HasCheckPage functions, fixes mislabeled Brendan/May headers, and adds header count to pokenav_unk_3
2019-08-21 17:18:38 -05:00
PikalaxALT
5b8d0f1c33 Remove MNUM from oam flip constant names 2019-08-21 17:15:23 -05:00
PikalaxALT
f7cf4fa154 Use HFLIP, VFLIP 2019-08-21 17:15:23 -05:00
PikalaxALT
a4d5624ad6 Move asm srcs to src 2019-08-21 17:08:40 -05:00
GriffinR
f08615881e Changes from review 2019-08-21 17:06:55 -05:00
GriffinR
5fb7ab05dd clean up 2019-08-21 17:06:55 -05:00
GriffinR
d931ba9602 document remaining funcs 2019-08-21 17:06:55 -05:00
GriffinR
7fc99f3952 favor lady funcs 2019-08-21 17:06:55 -05:00
GriffinR
771a7b25fa move data, more contest lady funcs 2019-08-21 17:06:55 -05:00
GriffinR
009caa21c8 some contest lady funcs 2019-08-21 17:06:55 -05:00
GriffinR
5d96a0cc97 minor fixes 2019-08-21 17:06:55 -05:00
GriffinR
fc467a9d52 standardize favour/favor 2019-08-21 17:06:55 -05:00
GriffinR
23979c4d7d initial documentation commit 2019-08-21 17:06:55 -05:00
Diegoisawesome
90edf596d8
Merge pull request #780 from GriffinRichards/document-rematchconstants
trainer rematch macro
2019-08-17 22:41:41 -05:00
Tustin2121
a708caac6d Suggested changes from review 2019-08-17 13:32:26 -04:00
Tustin2121
d12a8c10ee Documenting credits a bit 2019-08-17 13:26:44 -04:00
Tustin2121
bac8974ce3 Added note about addvar
The contest scripts actually use addvar to add a -1 to a variable instead of using subvar to subtract a positive number. This is fine in vanilla, where addvar script command does NOT support adding the value of a variable to another variable (like subvar supports), but should anyone want to change it, contests will be inexplicably broken.
2019-08-17 13:26:31 -04:00
Tustin2121
9bcd39d86c Document the braille window id. 2019-08-17 13:20:18 -04:00
Tustin2121
6508469259 Rename movobjectoffscreen to copyobjectxytoperm
Renaming the command to something that makes more sense as to what the command actually does. The command copies the current xy of the instantiated object back to its template, so that the object remains in the same place if the player walks away and despawns the object, and then comes back. "moveobjectoffscreen" implies that it might be taking the object and moving it physically to an off-screen location somehow.
2019-08-17 13:18:56 -04:00
DizzyEggg
eb0da420cf Undefs 2019-08-17 12:48:47 +02:00
DizzyEggg
51bfdffac3 Ability Capsule 2019-08-17 12:47:25 +02:00
GriffinR
3c2576d3a3
trainer rematch macro 2019-08-16 13:48:45 -04:00
GriffinR
ecf2097abb initial event_scripts documentation 2019-08-14 23:38:42 -04:00
DizzyEggg
08fe3b21ed
Fix modern
Fixes freeze on entering Pokemon Storage System
2019-08-12 11:43:31 +02:00
DizzyEggg
17be6766c7 Merge 2019-08-08 14:07:17 +02:00
PikalaxALT
37d23230fa Address review comments 2019-08-06 09:26:55 -04:00
PikalaxALT
1cff6672cf fix s32/int type mismatch on modern 2019-08-06 09:13:19 -04:00
PikalaxALT
5040a5f96b Move pokenav syms around 2019-08-05 20:23:56 -04:00
PikalaxALT
b05df0377e Finish pokenav_unk_9 2019-08-05 17:17:05 -04:00
PikalaxALT
1f62caae43 Some cleanup 2019-08-05 15:49:05 -04:00
PikalaxALT
195137b001
Merge pull request #768 from PikalaxALT/pokenav_unk_8
Finish pokenav_unk_8
2019-08-05 15:21:20 -04:00
PikalaxALT
5d07123354 Remove unnecessary casts 2019-08-05 14:32:30 -04:00
PikalaxALT
a7eb4f9dd2 Make pokenav_unk_8 syms static, fix gcc-9 warnings 2019-08-05 14:00:38 -04:00
PikalaxALT
e2e667d4b5 Finish pokenav_unk_8 2019-08-05 13:47:04 -04:00
PikalaxALT
330fc46df8 through sub_81CF3F8 2019-08-05 12:21:45 -04:00
PikalaxALT
9beeba8424
Merge pull request #764 from GriffinRichards/document-varnames
Document vars that are used and unnamed
2019-08-05 11:59:53 -04:00
GriffinR
191f74525d
name unused route state vars 2019-08-05 11:50:29 -04:00
GriffinR
c2bf668fdd
rename town/city vars 2019-08-05 11:23:45 -04:00
PikalaxALT
18f29c566a through sub_81CF278 2019-08-05 10:54:56 -04:00
PikalaxALT
463e1eb6b8 Name some fields in Pokenav2Struct 2019-08-05 09:17:21 -04:00
PikalaxALT
329670e16e Minor fixes 2019-08-05 08:46:52 -04:00
PikalaxALT
a42e5c24e6 Use LT return defines 2019-08-05 08:40:03 -04:00
PikalaxALT
51d5ee771d Merge branch 'master' into pokenav_unk_2 2019-08-05 08:33:45 -04:00
PikalaxALT
1fc64b8582
Merge pull request #767 from DizzyEggg/pokenav_8
More pokenav
2019-08-05 08:21:36 -04:00
PikalaxALT
ffc7a9be27 Fix build errors 2019-08-04 21:23:38 -04:00
PikalaxALT
ff2166b8fe pokenav_unk_2: unclutter global namespace 2019-08-04 21:10:08 -04:00
PikalaxALT
299c3cf1dc Finish pokenav_unk_2 2019-08-04 20:39:36 -04:00
PikalaxALT
2dee42dbaf through sub_81CA474 2019-08-04 18:15:02 -04:00
DizzyEggg
df1b804af8 Merge with master 2019-08-04 23:18:49 +02:00
PikalaxALT
cd876292d1 Merge branch 'master' into pokenav_unk_2 2019-08-04 15:35:35 -04:00
DizzyEggg
c8cc39cb57 More pokemav, massive clean-up, seriously who the left the file in this state??? 2019-08-04 19:09:12 +02:00
PikalaxALT
fa5bfc1627
Merge pull request #766 from DizzyEggg/pokenav_10
Decompile pokenav 10
2019-08-04 11:07:10 -04:00
PikalaxALT
41e1f9b224
Merge pull request #763 from DizzyEggg/patch-8
Fakematch sub_819A080
2019-08-04 11:05:17 -04:00
DizzyEggg
252df94bc1 Decompile pokenav 10 2019-08-04 13:53:00 +02:00
DizzyEggg
bb7e5ecc19 Pokemon jump 2019-08-04 00:18:58 +02:00
DizzyEggg
1641579297 Merge branch 'master' into pok_jump 2019-08-04 00:02:13 +02:00
DizzyEggg
5fbb11313b
Fakematch sub_819A080
Really wanted to match this one, but it just doesn't cooperate, oh well
2019-08-03 20:10:28 +02:00
PikalaxALT
ce941e6f56
Merge pull request #762 from GriffinRichards/GriffinRichards-documentation
Documenting MAPSEC use in pokenav match call data
2019-08-03 11:10:42 -04:00
PikalaxALT
9f50c4fa80
Merge pull request #760 from ultima-soul/use_pokeblock_data
Decompile use_pokeblock data
2019-08-03 11:01:05 -04:00
GriffinR
851a814912
typo fix 2019-08-02 22:23:40 -04:00
GriffinR
cff8331a8f
Update pokenav_match_call_data.c 2019-08-02 13:47:30 -04:00
GriffinR
3c4843f273
Update pokenav_unk_3.c 2019-08-02 12:46:18 -04:00
GriffinR
38a69d3e5f
sub_81D16DC in pokenav_match_call_data 2019-08-02 12:43:49 -04:00
GriffinR
97d58669b7
Document MapSec get functions 2019-08-02 12:40:14 -04:00
GriffinR
37ebfa40f9
Two more uses of MAPSEC_NONE and mapSec field name 2019-08-02 12:30:00 -04:00
GriffinR
cf253062b9
Use MAPSEC constants in sWallyAdditionalData 2019-08-02 10:58:03 -04:00
GriffinR
a9247181e8
Update pokenav_match_call_data.c 2019-08-02 10:52:40 -04:00
DizzyEggg
3280d40506 Match sub_8026324 2019-08-02 11:20:15 +02:00
GriffinR
4cea2ffa32
Use MAPSEC constants for pokenav match call data
Wally and Prof. Birch are skipped. Wally has a variable location, and Prof Birch (despite being listed as .v1 = 0, which is Littleroot) is actually listed as location unknown in the pokenav. Rival is also skipped, as they dont have a location field and are also listed as unknown
2019-08-01 23:01:53 -04:00
DizzyEggg
02d975a837 Tabs to spaces 2019-08-02 00:49:31 +02:00
DizzyEggg
9306c142b3 Merge dodrio with master 2019-08-02 00:45:49 +02:00
DizzyEggg
4d2d8779bf Dodrio berry picking decompiled 2019-08-02 00:41:55 +02:00
DizzyEggg
02cadbee60 MORE DODRIO BERRY PICKINGgit status! 2019-08-01 19:01:50 +02:00
ultima-soul
07015aa7ae Fix tabs. 2019-07-30 17:25:19 -07:00
ultima-soul
9a152f8fe6 Decompile data/use_pokeblock.s 2019-07-30 17:21:17 -07:00
PikalaxALT
a08cbaee0a pokenav_unk_2 staging 2019-07-30 19:46:56 -04:00
DizzyEggg
ba1a70419a Start dodrio magic 2019-07-31 00:27:30 +02:00
Diegoisawesome
242bed733f
Merge pull request #755 from DizzyEggg/patch-7
Functionally equivalent CopyGlyphToWindow
2019-07-30 14:35:04 -05:00
PikalaxALT
370e9afb37
Merge pull request #746 from garakmon/navdata
Pokenav Data
2019-07-30 15:03:12 -04:00
PikalaxALT
520eeae678
Merge pull request #756 from camthesaxman/vram
remove hardcoded VRAM addresses
2019-07-30 15:00:05 -04:00
DizzyEggg
7133f5db94 Clean up battle anim effects file 2019-07-30 15:08:49 +02:00
DizzyEggg
bcb17af751 Clean up contest link 80f57c4 file 2019-07-30 13:48:12 +02:00
ultima-soul
c77dc74410 Match TryInterruptEventObjectSpecialAnim without asm hack. 2019-07-29 17:52:01 -07:00
garak
08a3ff77dd index to slot in c file 2019-07-29 20:02:43 -04:00
DizzyEggg
81a11c4fc9 Gets rid of unnecesary casts in pokemon.c 2019-07-29 21:45:06 +02:00
DizzyEggg
af55029843 Prettier GetDeoxysStat 2019-07-29 21:44:03 +02:00
DizzyEggg
ff2dcf5413 Two fakematches out 2019-07-29 21:09:05 +02:00
garak
0c35ec2f7b fix build 2019-07-29 13:40:47 -04:00
garak
2580693ea5 INDEX to SLOT in encounter inja template 2019-07-29 13:12:20 -04:00
garak
5b57c001f5
Merge branch 'master' into navdata 2019-07-29 13:06:45 -04:00
garak
54c635683c fix some more pokenav 2019-07-29 13:03:03 -04:00
garak
b6483d7026 name match call messages by trainers 2019-07-29 12:58:15 -04:00
DizzyEggg
a4a382a004 Match sub_81D2278 and poke jump clean 2019-07-29 16:22:50 +02:00
DizzyEggg
e634e722cc Decompile pokemon jump 2019-07-29 12:35:57 +02:00
camthesaxman
87ac555e71 remove hardcoded VRAM addresses 2019-07-28 21:18:28 -05:00
DizzyEggg
3ad14f2b33
Functionally equivalent CopyGlyphToWindow 2019-07-28 10:37:44 +02:00
DizzyEggg
9ff4c0695e bss data to static 2019-07-26 10:16:00 +02:00
DizzyEggg
56b124fdec Some more pokenav 2019-07-25 21:41:02 +02:00
DizzyEggg
fd07c608fc Decompile pokemon unk 6 2019-07-25 18:56:08 +02:00
DizzyEggg
33c036e7ff Decompile pokemonav 7 2019-07-24 17:02:52 +02:00
PikalaxALT
6ff1426abe Quieter "make tools" 2019-07-23 16:17:00 -04:00
DizzyEggg
8cc776e2ee
tilemap glitch gpu reg fix hopefully 2019-07-23 21:30:53 +02:00
garak
cd6fd3110f fix modern build 2019-07-20 13:27:57 -04:00
garak
c39d25ff4d
Merge branch 'master' into navdata 2019-07-20 12:30:41 -04:00
PikalaxALT
8d0d5cfd55 Merge branch 'master' into modern_gcc 2019-07-20 11:51:22 -04:00
garak
dfa3e079c0 finish pokenav data decomp 2019-07-19 22:57:33 -04:00
garak
f9a9297d4f decompile pokenav 7/8 data 2019-07-19 22:06:42 -04:00
garak
f6d55db535 decompile pokenav_unk_5 data 2019-07-19 21:05:55 -04:00
garak
690a0c4390 decompile pokenav_unk_4 rodata 2019-07-19 19:36:17 -04:00
garak
c400d1dc7f decompile pokenav_unk_3 data 2019-07-19 18:31:42 -04:00
garak
b68ab6106d pokenav unk 2 data decomp 2019-07-19 17:23:52 -04:00
PikalaxALT
20863ac85b Resolve compile warnings in modern 2019-07-18 20:46:00 -04:00
Gudf
75f165ed74 Use a constant instead of integer literals when checking for shinyness 2019-07-11 20:16:39 +02:00
PikalaxALT
71dff6dbf1 Remove unnecessary tutor learnset casts 2019-07-10 16:38:05 -04:00
pokballs
717c3350c4 updated function name for deposit item amount to pc 2019-07-09 16:40:04 -05:00
DizzyEggg
c3733f4b95 Decompile 4 berry crush functions 2019-07-09 16:39:29 -05:00
DizzyEggg
11fb13d635 Some pokemon jump work 2019-07-09 16:39:29 -05:00
PikalaxALT
7fd327d632 Stack-free IWRAM clear 2019-07-07 21:41:11 -04:00
DizzyEggg
dd131f2558 Merge branch 'master' into item_expansion 2019-07-04 10:39:09 +02:00
PikalaxALT
8d224bf941 Merge branch 'master' into modern_gcc 2019-07-02 13:47:34 -04:00
Diegoisawesome
81b84503fa
Merge pull request #734 from DizzyEggg/patch-1
Match sub_81D1B40
2019-07-02 20:25:31 +09:00
Diegoisawesome
ba7fe29d47
Merge pull request #736 from DizzyEggg/patch-2
Match sub_802671C
2019-07-02 20:07:20 +09:00
Diegoisawesome
f25a75f9e9
Merge pull request #737 from DizzyEggg/patch-3
Match sub_800EFB0
2019-07-02 20:06:33 +09:00
Diegoisawesome
b123e4a73b
Merge pull request #738 from DizzyEggg/patch-4
Match unref_sub_8119094
2019-07-02 20:05:58 +09:00
Diegoisawesome
c3e683789c
Merge pull request #739 from DizzyEggg/patch-5
Clean up code in HoldContestPainting
2019-07-02 20:05:27 +09:00
garak
4594c955b4 create defines to support encounter index ratios 2019-07-01 23:47:45 -04:00
DizzyEggg
2da0e73ec7
Get rid of unneccesary cast in text.c 2019-07-01 21:08:49 +02:00
DizzyEggg
548f486398
Clean up code in HoldContestPainting 2019-07-01 17:47:47 +02:00
DizzyEggg
5ce047c26c
Match unref_sub_8119094
Gotta match these unused functions, am I right?
2019-07-01 15:06:58 +02:00
PikalaxALT
f300f9e699 Revert FLOAT_U* and DOUBLE_U* macros 2019-06-30 19:31:29 -04:00
PikalaxALT
92f17e8812 Document pokemon_animations sprite ptr bug 2019-06-30 19:19:26 -04:00
DizzyEggg
42462b6730
Match sub_800EFB0 2019-06-30 21:07:25 +02:00
DizzyEggg
11ef698344
Match sub_802671C
Also got sub_8026324 a bit closer, but it's still a mess.
2019-06-30 20:26:48 +02:00
PikalaxALT
04c9793429 Fix pokemon_animation.c 2019-06-30 13:49:24 -04:00
garak
adb0a44457 add field info to wild pokemon json 2019-06-30 12:05:45 -04:00
DizzyEggg
c409d19530
Match sub_81D1B40 2019-06-30 17:14:41 +02:00
Michael Panzlaff
7500534676 fix unaligned memory access in BlendPalette
This problem is only going to occur in versions where the palette
buffer isn't aligned to 4 bytes (which it is in a matching pokeemerald).

Since agbcc returns sizeof(PlttData) = 4, it will read words
instead of half words. This causes unnecessary emulator warnings
in the function "BlendPalette".
Aligning the buffers to 4 bytes fixes this.
2019-06-29 11:08:46 -05:00
PikalaxALT
f9d8678db4 Additional fixes
Rearrange gbafix to not modify file in the event of failure
Fix bug where Dma3Manager may get stuck when compiled with gcc-9.1.0
2019-06-29 11:41:26 -04:00
PikalaxALT
4b759da714 Wildcard bss, ewram_data, and COMMON in modern toolchain 2019-06-29 08:35:52 -04:00
DizzyEggg
34aa9b9c56 Merge branch 'master' into item_expansion 2019-06-28 09:34:16 +02:00
PikalaxALT
b839c21307 Fix/suppress warnings when building with gcc-8 2019-06-26 16:42:57 -04:00
PikalaxALT
fb06e4a3c9 Modernize code
Can compile with arm-none-eabi-gcc 8.3.0
gbafix correctly handles ELF input
2019-06-26 12:12:10 -04:00
PikalaxALT
f3c7e1cc81 Add comment to merged field 2019-06-21 18:18:29 -05:00
PikalaxALT
d22c630b2b Merge two fields in party_menu heap struct 2019-06-21 18:18:29 -05:00
PikalaxALT
3f43523352 Add comment to merged field 2019-06-21 12:38:11 -04:00
PikalaxALT
d0bd1df531 Merge two fields in party_menu heap struct 2019-06-21 09:54:48 -04:00
garak
fbbc2b1d8b finish src metatile labels 2019-06-16 10:08:07 -05:00
garak
9f8a30e4e7 label metatiles in fldeff_cut.c 2019-06-16 10:08:07 -05:00
garak
8b26bd1e09 label metatiles for general, fallarbor, and sootopolis gym tilesets 2019-06-16 10:08:07 -05:00
garak
aad839995f label metatiles for pacifidlog and fortree bridges 2019-06-16 10:08:07 -05:00
garak
724add638c label regi cave metatiles 2019-06-16 10:08:07 -05:00
garak
7e35b8a710 label remaining metatiles in field_specials.c 2019-06-16 10:08:07 -05:00
garak
a9560d9c62 give metatile labels to petalburg gym and pcs 2019-06-16 10:08:07 -05:00
garak
c68ba9f4e8 label mauville gym metatiles 2019-06-16 10:08:07 -05:00
DizzyEggg
0eaddd251c Merge branch 'master' into item_expansion 2019-06-03 11:06:09 +02:00
DizzyEggg
c81d06b712 Fix EV wings 2019-06-03 11:05:03 +02:00
DizzyEggg
832c452f0b
Merge pull request #148 from LOuroboros/item_expansion
Added the data, sprites and sprites data of the Wings.
2019-05-28 10:22:38 +02:00
DizzyEggg
f64c1dfabf Some pokenav work 2019-05-26 07:20:51 -05:00
DizzyEggg
818e1909ff Make nonmatching PSS functions functionally equivalent 2019-05-26 07:17:05 -05:00
Slawter666
5f292d621a Use event object constants 2019-05-25 14:41:48 -05:00
DizzyEggg
453be19670 change cooltrainer unused class name 2019-05-25 08:26:40 -05:00
DizzyEggg
a074f36766 USE PROTAG 2019-05-25 08:26:40 -05:00
DizzyEggg
e706280503 Rename PKMN TRAINER CALSS 4 2019-05-25 08:26:40 -05:00
Papa Cancer
e53ba4773d Documenting bags, berries and graphics
Bag graphics and berry graphics mostly documented
item_menu.c significantly documented
Bag structs documented and functions renamed to match formatting
2019-05-22 21:10:16 -05:00
Flametix
dbdb827e54 Fix typos (#713)
* fix typos
2019-05-18 21:56:19 -05:00
AJ Fontaine
ba27907f98
Fix some typos in item names 2019-05-17 21:07:44 -04:00
DizzyEggg
ab421f1089 Use array count for trainer parties 2019-05-17 07:33:22 -05:00
LOuroboros
c8a7f2a32c Oops. I've put the .secondaryId field for the Muscle Wing twice. 2019-05-17 07:56:54 -03:00
LOuroboros
2592d38303 Added the data, sprites and sprites data of the Wings. 2019-05-17 07:52:41 -03:00
DizzyEggg
ca51bc23bf Merge branch 'master' into item_expansion 2019-05-17 09:36:35 +02:00
garak
60baf19d45 rename gFacilityClassPicsByIndex to gLinkPlayerFacilityClasses 2019-05-16 17:10:13 -05:00
garak
daecd5ec40 name some trainer card related functions 2019-05-16 17:10:13 -05:00
DizzyEggg
188f2aa29e ability random define for battle pyramind 2019-05-16 17:09:43 -05:00
DizzyEggg
4ae1e014bc Change abilities in base stats to array 2019-05-16 17:09:43 -05:00
DizzyEggg
33979f0fa6 use ability num instead of alt ability 2019-05-16 17:09:43 -05:00
Slawter666
2fdc489bc0 Further documentation of party_menu.c 2019-05-15 16:55:39 -05:00
Slawter666
d1a12be53a Minor party_menu.c documentation 2019-05-15 16:55:39 -05:00
DizzyEggg
6f5e9a1944 Merge branch 'master' into item_expansion 2019-05-14 14:02:07 +02:00
PikalaxALT
539d472796 Merge branch 'master' into dodrio_berry_picking 2019-05-11 21:22:09 -04:00
Marcus Huderle
0babaa8c07 Convert wild encounter data to JSON 2019-05-08 17:06:39 -05:00
DizzyEggg
5b23f3787e Tweak up batle item's secondary ids 2019-05-04 09:15:10 +02:00
huderlem
fe59902b8a Fix indentation 2019-05-03 18:21:11 -05:00
hjk321
26114d4579 Update comparison 2019-05-03 18:21:11 -05:00
hjk321
ee4049d93e Fix indentation Error 2019-05-03 18:21:11 -05:00
hjk321
438c5432aa Document MON_DATA_10 2019-05-03 18:21:11 -05:00
hjk321
106a89eace Document magic number from atk04_critcalc 2019-05-03 18:21:11 -05:00
PikalaxALT
f13e1c78b2 through sub_81CA0EC 2019-05-02 17:53:00 -04:00
PikalaxALT
a14162eb9f through sub_81C9F28 2019-05-02 16:43:32 -04:00
PikalaxALT
518865d8d9 sub_81C9A10 2019-05-02 16:19:25 -04:00
LOuroboros
eaafcd539d Fixed the Power Items' hold effects. 2019-05-02 15:47:43 -03:00
LOuroboros
fbdcbfd33d Fixed Silvally's Memory items' hold effects. 2019-05-02 15:39:47 -03:00
PikalaxALT
9b40cdaeb9 through sub_81C99FC 2019-05-02 14:27:59 -04:00
LOuroboros
713e660666 Updated the price tags of the X Items to their USUM standard. 2019-05-02 15:19:30 -03:00
LOuroboros
36d8371950 Added the sprites and the data for the missing items. 2019-05-02 15:11:06 -03:00
LOuroboros
90e94f50d9 Defined a hold effect for every battle-related item, and added all the missing items' data. 2019-04-30 22:07:43 -03:00
LOuroboros
e77960d2f3 Updated the effects of the Sea and Lax Incenses, and added the item data of the Gen. 4 incenses. 2019-04-30 20:07:12 -03:00
LOuroboros
cda17700c3 Defined a lot of hold effects and added more items data. 2019-04-30 19:41:10 -03:00
LOuroboros
71472b1439 Power items data. 2019-04-30 16:07:48 -03:00
LOuroboros
a48c8f6aba Sachet and Whipped Dream data. 2019-04-30 15:42:36 -03:00
LOuroboros
3316427728 Dubious Disc, Reaper Cloth, Razor Claw, Razor Fang and Prism Scale data. 2019-04-30 15:34:38 -03:00
LOuroboros
e0540dff46 Oval Stone, Protector, Electirizer and Magmarizer data. 2019-04-30 15:00:51 -03:00
LOuroboros
850c93ec64 Rare Bone data. 2019-04-30 14:44:39 -03:00
LOuroboros
3d12e76411 Added Oricorio's Nectars' data. 2019-04-30 14:25:52 -03:00
LOuroboros
f521bec102 Added the 7 Apricorns' data. 2019-04-30 14:09:51 -03:00
LOuroboros
b1ab37820b Dawn, Dusk, Shiny and Ice Stones data. 2019-04-30 13:39:58 -03:00
LOuroboros
c5f6f5e588 Renamed X Special to X Special Attack and added the item data for Old Gateau and X Special Defense. 2019-04-30 13:06:08 -03:00
LOuroboros
8e3f2d1e2d Sweet Heart and Big Malasada data. 2019-04-30 12:38:51 -03:00
DizzyEggg
e9a104a0c1 Merge with master 2019-04-30 17:05:09 +02:00
Fontbane
901a83d249 Fix some labels and include decorations.h
Include decorations.h in shop.c

Include decorations.h in event_scripts.s
2019-04-22 17:23:59 -05:00
Fontbane
6cf06d5f95 Doc some event scripts
Doc decoration shops

Revert "Doc decoration shops"

This reverts commit 64d935ea0dc942c32b89487137e5703fce34b435.

Document through comments

Un-revert decor documentation
2019-04-22 17:23:59 -05:00
Fontbane
2c076f1f3e Doc most OnTransitions 2019-04-22 17:23:59 -05:00
DizzyEggg
50eeddfec6 Evolution stone item effects 2019-04-17 13:05:19 +02:00
DizzyEggg
896d99f919 Merge with master 2019-04-17 12:58:05 +02:00
Marcus Huderle
b8d5c5fb76 Match sub_81D199C 2019-04-16 18:15:03 -05:00
Marcus Huderle
90e555d23e Match sub_81A1224 2019-04-16 16:11:59 -05:00
Marcus Huderle
9915a3fd7f Decompile pokenav_unk_5.c 2019-04-16 14:29:00 -05:00
DizzyEggg
912b87564f Compact item data, make descriptions easier to read 2019-04-16 11:25:26 -05:00
DizzyEggg
b4e1375bb6 Document pokemon item effects 2019-04-16 11:23:09 -05:00
Marcus Huderle
f9f5f34b0c Finish decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
Marcus Huderle
c7954e1212 Decompile pokenav_unk_4.c through sub_81CB678() 2019-04-16 11:21:13 -05:00
Marcus Huderle
394c0f5546 Start decompiling pokenav_unk_4.c 2019-04-16 11:21:13 -05:00
DizzyEggg
77d7295607 Balls caching effects 2019-04-16 09:38:49 +02:00
DizzyEggg
f97125fc63 Fill most of what new berries data 2019-04-15 11:50:31 +02:00
Papa Cancer
4f048955e6 Decap existing item names 2019-04-14 23:00:03 +01:00
DizzyEggg
42e7930987 Almost done with the balls 2019-04-14 21:49:31 +02:00
Marcus Huderle
f40f2c5e9c Decompile all of pokenav_unk_3.c 2019-04-14 13:44:44 -05:00
Marcus Huderle
e3bdb08efa Start decompiling pokenav_unk_3.c 2019-04-14 13:44:44 -05:00
DizzyEggg
19fdfaa5f2 Use constants for ball particles 2019-04-14 10:19:50 -05:00
DizzyEggg
59797e4801 Use constants in battle_anim_special.c 2019-04-14 10:19:50 -05:00
DizzyEggg
dc764698c9 Use implicilt berry indexes in arrays 2019-04-14 10:15:18 -05:00
DizzyEggg
9ca2af0ce9 More pokeballs expansion 2019-04-14 12:13:44 +02:00
DizzyEggg
8e19a552ae Begin pokeball expansion 2019-04-14 10:53:47 +02:00
DizzyEggg
d9fc6d36be Merge branch 'master' into item_expansion 2019-04-14 09:52:07 +02:00
Marcus Huderle
065c60544d Cleanup some pokenav code 2019-04-13 16:18:04 -05:00
Marcus Huderle
1268691410 Finish decompiling pokenav_unk_1.c 2019-04-13 16:18:04 -05:00
Marcus Huderle
cb9d471a2a Decompile pokemon_jump through sub_802CE48() 2019-04-13 11:37:50 -05:00
Phlosioneer
8338e29279 Pokenav unk 1 almost done 2019-04-13 11:34:53 -05:00
Phlosioneer
2b740b46e8 About halfway done with pokenav_unk_1.s 2019-04-13 11:34:53 -05:00
Phlosioneer
ee2edb068a Start decomp of pokenav_unk_1
Looks like it's the Ribbons menu, based on the first function.
2019-04-13 11:34:53 -05:00
DizzyEggg
0996404139 Get all availabe items data 2019-04-13 13:30:38 +02:00
DizzyEggg
896602db5b Begin item expansion 2019-04-13 13:14:45 +02:00
DizzyEggg
518f9c0638 Some nonmatchings 2019-04-11 07:02:48 -05:00
DizzyEggg
5bc640da9b nonmatchings 2019-04-11 07:02:48 -05:00
Marcus Huderle
a65cffef42 Decompile more pokemon_jump.c 2019-04-10 20:34:17 -05:00
Marcus Huderle
8a617c3d94 Decompile more pokemon_jump.c 2019-04-09 19:48:21 -05:00
huderlem
ce93d3ab9a
Merge pull request #661 from Phlosioneer/contest-ai-cleanup
contest & contest_ai cleanup
2019-04-08 17:30:28 -05:00
Sewef
c8ce1a0a1f Two labels from pokeruby. 2019-04-08 17:30:10 -05:00
ultima-soul
21722d9931 Fix formatting 2019-04-08 17:29:44 -05:00
ultima-soul
2c432c314a Match sub_8159308 2019-04-08 17:29:44 -05:00
Phlosioneer
92851ba4e6 Trim headers from pokenav.c 2019-04-08 17:29:07 -05:00
Marcus Huderle
a518810c17 Decompile more pokemon_jump.c 2019-04-07 19:23:14 -05:00
Phlosioneer
50350cc2e1 Merge branch 'master' into contest-ai-cleanup 2019-04-07 20:20:22 -04:00
Phlosioneer
29c986e21e Fix nonmatching MatchCall_MoveWindow function 2019-04-07 19:18:32 -05:00
huderlem
a4ea0ac816
Merge pull request #645 from Phlosioneer/pokenav-decomp-again
Pokenav decomp again
2019-04-07 18:03:32 -05:00
Phlosioneer
8de9c2d912 First round of fixes 2019-04-07 18:31:01 -04:00
Phlosioneer
d352999cd8 Change "navgear" to "pokenav" 2019-04-07 18:10:53 -04:00
Phlosioneer
0dc73b0b3a Break up pokenav into subfiles
The files are separated based on the pokenav resources substruct
ID they use.
2019-04-07 14:40:35 -04:00
Marcus Huderle
78151b6d88 Start decompiling pokemon_jump.c 2019-04-07 13:12:27 -05:00
Phlosioneer
d84d94e29a Merge branch 'master' into pokenav-decomp-again 2019-04-07 01:56:36 -04:00
Phlosioneer
ad2a97935e Document left header system 2019-04-07 01:32:42 -04:00
Phlosioneer
ddfe0f91cf Document decompiled parts of the pokenav main menu 2019-04-06 23:34:30 -04:00
Phlosioneer
3b45f37517 Significant documentatioon progress 2019-04-06 16:25:08 -04:00
Marcus Huderle
c3cfd60658 Generate zoom_tiles palette from correct image 2019-04-06 15:16:05 -05:00
Marcus Huderle
b251ddf3b4 Add explicit return to Alloc funcs 2019-04-06 13:58:06 -05:00
Marcus Huderle
fe12f2f4b3 Document and cleanup some decoration code 2019-04-06 12:49:09 -05:00
Fontbane
4a09a5da33 Doc field move scripts completely, use fldeff constants for dofieldeffect
Fix labels

Fix labels again

Delete extra boulder scripts

Now it should build fine
2019-04-06 12:48:50 -05:00
DizzyEggg
b85a74afc5 Give names to battle anim backgrounds 2019-04-06 12:44:27 -05:00
DizzyEggg
19f151417e Rename sprite sheet to sprite gfx 2019-04-06 10:14:48 -05:00
DizzyEggg
b93581b519 Rename battle anim sprites 2019-04-06 10:14:48 -05:00
DizzyEggg
311c1b9cba Change anim tag names 2019-04-06 10:14:48 -05:00
Phlosioneer
bc50686158 Decomp everything onvolving UnknownSubStruct_81C81D4
Now I can start cleaning up the fields and substructs
2019-04-06 03:42:14 -04:00
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
DizzyEggg
9a11764b52 Fix oam in menu specialised 2019-04-05 07:53:23 -05:00
DizzyEggg
70569e7ebc Use shiny species tag 2019-04-05 07:53:23 -05:00
DizzyEggg
8751fafad1 Make it compile 2019-04-05 07:53:23 -05:00
DizzyEggg
b0223f691f Clean up data headers 2019-04-05 07:53:23 -05:00
DizzyEggg
c36476af85 Clean up data2b.c 2019-04-05 07:53:23 -05:00
DizzyEggg
dd24597d52 Finish up menu specialised 2019-04-05 07:53:23 -05:00
PikalaxALT
a58d9a16dd Merge branch 'master' into dodrio_berry_picking 2019-04-05 08:41:31 -04:00
Fontbane
9e74409bb2 Fix labels, label more scripts 2019-04-04 19:34:35 -05:00
AJ Fontaine
704f025a00 Fix a typo in as(s)istattackselect 2019-04-04 19:34:35 -05:00
PikalaxALT
016021ac04 Move gUnknown_02022C90 from sym_ewram.txt 2019-04-04 19:26:45 -05:00
PikalaxALT
8db03ba6fa Documentation of ereader helpers, 2 2019-04-04 19:26:45 -05:00
PikalaxALT
c46f271f67 Documentation of ereader_helpers, 1 2019-04-04 19:26:45 -05:00
PikalaxALT
cb04af05dc Resolve unnecessarily externed symbols 2019-04-04 19:26:45 -05:00
PikalaxALT
53efbe2832 Finish decomp of union_room_chat 2019-04-04 19:26:45 -05:00
PikalaxALT
a47abb3949 union_room_chat data, 1 2019-04-04 19:26:45 -05:00
Phlosioneer
1360b3a477 RGB Constants 2019-04-04 17:05:46 -04:00
Phlosioneer
50da52c29b Fix utf8 errors in contest_effect's comments 2019-04-04 16:00:25 -04:00
Diegoisawesome
f125de3e66
Merge pull request #659 from ultima-soul/pokemon
Remove pokemon_3.h
2019-04-04 12:49:46 -05:00
Diegoisawesome
8361ada4ba
Merge pull request #656 from ultima-soul/menu_specialized
Decompile some of menu_specialized
2019-04-04 12:49:17 -05:00
Diegoisawesome
e476a6d02d
Merge pull request #624 from Wyrserth/master
Use constants for naming screen's pages
2019-04-04 12:44:18 -05:00
ultima-soul
64da3d051e Fix formatting. 2019-04-03 21:15:45 -07:00
ultima-soul
91a94a0ca1 Try to get closer to matching. 2019-04-03 21:13:26 -07:00
Phlosioneer
3b3b2dd031 General cleanup of the second half of contest.c 2019-04-03 20:43:23 -04:00
ultima-soul
48d27c035a Remove pokemon_3.h 2019-04-03 15:15:08 -07:00
PikalaxALT
4fadbaf161 Minor fixes
gotoram --> returnram
cmdCF/execram --> gotoram
fix indentation in sym_ewram.txt
fix mevent_client.h guard name
2019-04-03 17:04:42 -05:00
PikalaxALT
33ee31b2e0 remove last remaining trace of "ish" 2019-04-03 17:04:42 -05:00
PikalaxALT
d0384ee95e mevent_server_ish --> mevent_client 2019-04-03 17:04:42 -05:00
PikalaxALT
d220f876fc Some symbol documentation 2019-04-03 17:04:42 -05:00
PikalaxALT
b17c85ff7c Use named fields for command structs 2019-04-03 17:04:42 -05:00
PikalaxALT
28646ea64e Decompile mevent server scripts 2019-04-03 17:04:42 -05:00
PikalaxALT
6c12d154e7 Reformat mevent server and client scripts 2019-04-03 17:04:42 -05:00
PikalaxALT
03badd9c40 mevent_server_ish 2019-04-03 17:04:42 -05:00
PikalaxALT
dabd1f6177 finish mevent_server.s 2019-04-03 17:04:42 -05:00
PikalaxALT
a455d98385 start porting mevent_server from firered 2019-04-03 17:04:42 -05:00
DizzyEggg
438521bf21 Get rid of redundant cast 2019-04-03 17:04:07 -05:00
Phlosioneer
3a2ea40188 Rename and document more contest setup functions
Also properly label the link contest flags variable, and label the
contest window ID's.
2019-04-03 17:24:32 -04:00
Phlosioneer
f82bdb332a Document applause meter code 2019-04-03 03:00:06 -04:00
ultima-soul
02651f6177 Attempt to decompile menu_specialized. 2 NONMATCHING 2019-04-02 19:18:36 -07:00
Phlosioneer
8f13e991d2 Found a debug system for pokemon contests 2019-04-02 21:51:21 -04:00
Phlosioneer
f79a2fda68 Document the nextTurnOrder calculations 2019-04-02 20:46:18 -04:00
Phlosioneer
99e8e8e53f More cleanup, document contestant sorting 2019-04-02 20:00:05 -04:00
Marcus Huderle
181baf9fe5 Merge remote-tracking branch 'upstream/master' into misc_docs
# Conflicts:
#	src/field_weather_effect.c
2019-04-02 18:29:51 -05:00
Marcus Huderle
1241700b20 Finish documenting the other weather effects 2019-04-02 18:28:56 -05:00
DizzyEggg
d8c9f1b30f Rows and columns 2019-04-02 16:28:38 -05:00
DizzyEggg
baa187665b Document a bit of script menu and battle anims 2019-04-02 16:28:38 -05:00
DizzyEggg
2745cdc7d2 Remove unneeded sMonAnimationDelayTable entries 2019-04-02 16:27:58 -05:00
DizzyEggg
02e2b1af97 Use species defines in gMonIconTable 2019-04-02 16:09:03 -05:00
Phlosioneer
201c0953ae Cleanup OamData entries 2019-04-02 07:41:50 -05:00
DizzyEggg
1aa95a1821 Document a bit of anims 2019-04-02 07:31:06 -05:00
Phlosioneer
6916f09cd5 Expand MatchCallStruct defs, use REMATCH_* enum 2019-04-02 07:28:30 -05:00
Phlosioneer
65d8b68f9d Expicitly hardcode rematch indecies
Inserting an entry without updating the indecies will now cause a
compiler error. This will make it easier for modders to remember to
update the constants.
2019-04-02 07:28:30 -05:00
Phlosioneer
ca9f7fe356 Fix hardcoded array sizes 2019-04-02 07:28:30 -05:00
Phlosioneer
c3200c0beb Cleanup some of gContestResources 2019-04-02 00:35:57 -04:00
PikalaxALT
7571969a45 Finish union room battle 2019-04-01 22:08:50 -05:00
PikalaxALT
4be97b2dc6 through sub_801A960 2019-04-01 22:08:50 -05:00
Phlosioneer
845307b3a6 Rename contest AI stuff 2019-04-01 22:16:07 -04:00
Marcus Huderle
35505c7f5b Document somre more weather effects 2019-04-01 20:04:23 -05:00
Phlosioneer
c429e6d69c Move gPlayerFacingPosition out of sym_ewram.txt (#617)
* Move gPlayerFacingPosition out of sym_ewram.txt

* Fix tabs in sym_ewram.txt

* Remove redundant faraway island extern
2019-04-01 19:30:41 -05:00
PikalaxALT
9f1d1219ce create header and fix prototypes 2019-04-01 14:20:34 -04:00
PikalaxALT
ce89cf6f75 through sub_801A3D0 2019-04-01 14:09:56 -04:00
PikalaxALT
1fe5208560 through sub_801A02C 2019-04-01 12:05:58 -04:00
huderlem
1e8e5af033
Merge pull request #607 from Phlosioneer/contest-data
Contest data
2019-04-01 07:37:15 -05:00
huderlem
bee1d1cbb0
Merge pull request #611 from Phlosioneer/pokedex-area-const-array
Document sAreaGlowTilemapMapping
2019-04-01 07:33:33 -05:00
Marcus Huderle
099ea89b77 Document rain weather effect 2019-03-31 21:09:30 -05:00
Phlosioneer
cd069446e0 Merge branch 'master' into pokedex-area-const-array 2019-03-31 20:43:42 -04:00
Phlosioneer
3181c64c64 Change names from MAP_AREA_ to MAP_GROUP_ 2019-03-31 20:40:14 -04:00
Phlosioneer
b7057e8d92 Update OAMs to use new constants 2019-03-31 20:33:25 -04:00
Phlosioneer
37c7441a15 Merge branch 'master' into contest-data 2019-03-31 20:22:47 -04:00
Phlosioneer
23ac2cc94e Prep for merge 2019-03-31 20:15:44 -04:00
Phlosioneer
207a54393c Fix mistakes and use EVENT_OBJ_GFX_* macros 2019-03-31 20:07:24 -04:00
PikalaxALT
ade0183378 Document mystery_gift 2019-03-31 18:59:52 -04:00
PikalaxALT
0a8427c8ef fakematching task00_mystery_gift 2019-03-31 15:43:51 -05:00
PikalaxALT
90fb329b70 through task_add_00_mystery_gift 2019-03-31 15:43:51 -05:00
PikalaxALT
fb5c19a33b through mevent_message 2019-03-31 15:43:51 -05:00
PikalaxALT
813de11154 Through mevent_save_game 2019-03-31 15:43:51 -05:00
PikalaxALT
f88f815cff WIP sub_8018DAC 2019-03-31 15:43:51 -05:00
PikalaxALT
608a217240 sub_8018B08 2019-03-31 15:43:51 -05:00
PikalaxALT
82a3f29b88 through sub_8018A50 2019-03-31 15:43:51 -05:00
PikalaxALT
aafe9df454 through sub_8018798 2019-03-31 15:43:51 -05:00
PikalaxALT
f34cda3b52 Start decompiling mystery gift 2019-03-31 15:43:51 -05:00
Marcus Huderle
d13563b174 Document some faraway_island code 2019-03-31 14:09:40 -05:00
Marcus Huderle
462b196abc Give battle_anim files appropriate names 2019-03-31 12:15:39 -05:00
Marcus Huderle
500d009b5c Start decompiling berry_crush.c 2019-03-31 09:13:19 -05:00
huderlem
b9bf3bf072
Merge pull request #637 from DizzyEggg/pokeblock_attempt
Use Pokeblock clean-up and some menu_specialised decomp
2019-03-31 08:39:18 -05:00
DizzyEggg
e3c07c83f2 More work on use pokeblock 2019-03-31 14:32:26 +02:00
DizzyEggg
aa7f69f067 Begin use pokeblock and menu specialised 2019-03-31 12:59:01 +02:00
PikalaxALT
ccac4694cd Merge branch 'master' into continue_union_room 2019-03-30 12:41:10 -04:00
DizzyEggg
35cffea987 Helpful macros for atk49 2019-03-30 08:29:56 -05:00
PikalaxALT
3b9275b133 sub_8018404 2019-03-30 09:23:47 -04:00
PikalaxALT
2f57d6bc0f sub_8018220 2019-03-30 09:18:58 -04:00
Marcus Huderle
accc5ae8dd Merge remote-tracking branch 'upstream/master' into union_room_chat
# Conflicts:
#	ld_script.txt
2019-03-29 21:27:08 -05:00
Marcus Huderle
a978a6a624 Finish decompiling union_room_chat.c 2019-03-29 21:26:08 -05:00
PikalaxALT
2e588fd4d7 through sub_80181DC 2019-03-29 22:22:26 -04:00
PikalaxALT
6b6c98e7d0 through sub_80180E8 2019-03-29 19:41:32 -04:00
PikalaxALT
8d75dc1982 sub_8017EA0 2019-03-29 17:19:29 -04:00
PikalaxALT
bf4a73a67c through sub_8017E00 2019-03-29 16:24:48 -04:00
PikalaxALT
8fc51b0459 through sub_8017CB0 2019-03-29 15:50:04 -04:00
PikalaxALT
ae0e70d7bb sub_80179D4 and rodata 2019-03-29 11:57:03 -04:00
Marcus Huderle
519426f4e6 Decompile union_room_chat through sub_8020118 2019-03-28 20:20:52 -05:00
Marcus Huderle
8b8cc7a475 Decompile union_room_chat.s through sub_801FF08 2019-03-28 18:40:49 -05:00
PikalaxALT
030fb4d898 through sub_80179AC 2019-03-28 11:24:50 -04:00
PikalaxALT
86f7691146 Through sub_80176E4 2019-03-28 10:24:31 -04:00
PikalaxALT
963dcfb84d sub_80173E0 2019-03-28 09:59:08 -04:00
PikalaxALT
9538855d9a Through sub_80173D4 2019-03-28 08:42:35 -04:00
PikalaxALT
7211f996a5 Address review comments, 1
Use field names in WindowTemplate instances
Remove a leftover comment block
2019-03-28 07:32:25 -05:00
PikalaxALT
7c45a7c443 port mevent_801BAAC from fire red 2019-03-28 07:32:25 -05:00
Marcus Huderle
aebc676913 Decompile union_room_chat.c up to sub_801F5B8 2019-03-27 19:09:12 -05:00
PikalaxALT
51d2131dc2 through (nearly-matching) sub_80172A0 2019-03-27 16:57:34 -04:00
PikalaxALT
8e0773675c through sub_8017168 2019-03-27 13:16:10 -04:00
PikalaxALT
9a8b001ebf through sub_801704C 2019-03-27 10:44:49 -04:00
PikalaxALT
44f7d49c2e Finish sub_8016CA0 2019-03-27 09:54:19 -04:00
scnorton
c6c0c9582f Port menews_jisan.c from FireRed 2019-03-27 07:40:08 -05:00
Marcus Huderle
af1baa89f1 Start decompiling union_room_chat.c 2019-03-26 21:58:20 -05:00
scnorton
a677d1f4cb Failed attempt at sub_8026988 2019-03-26 14:46:58 -04:00
scnorton
2eba82b0fb sub_8026634 2019-03-26 11:59:39 -04:00
PikalaxALT
df538ff7ab WIP sub_8026324 2019-03-26 09:47:13 -04:00
scnorton
03e58d7dc9 through sub_80262C0 2019-03-25 18:08:25 -04:00
scnorton
5de624783c through sub_8026044 2019-03-25 17:27:27 -04:00
scnorton
e3a11bc3ca through sub_80259FC 2019-03-25 15:26:23 -04:00
scnorton
c3e26a58df through sub_8025758 2019-03-25 12:08:56 -04:00
scnorton
4780f208d3 through sub_8025324 2019-03-25 11:22:48 -04:00
PikalaxALT
c005c2f737 sub_8024FFC 2019-03-25 08:31:29 -04:00
PikalaxALT
d4cca4ffa2 through sub_8024F38 2019-03-24 22:56:16 -04:00
PikalaxALT
d49d3b6858 through sub_8024E38 2019-03-24 21:17:25 -04:00
scnorton
708f128568 Merge branch 'master' into dodrio_berry_picking 2019-03-24 20:08:49 -04:00
Marcus Huderle
d7a9fcb975 Cleanup mevent2 2019-03-24 18:29:00 -05:00
Marcus Huderle
e6caf0ff10 Port mevent2.c from pokefirered 2019-03-24 18:29:00 -05:00
scnorton
2136187c11 sub_8024BC8 2019-03-24 17:32:59 -04:00
scnorton
98ab62a7af Dodrio: through sub_8024A30 2019-03-24 16:42:42 -04:00
ultima-soul
552c032f5c Match sub_8166A34 2019-03-24 15:34:49 -05:00
Marcus Huderle
cf917a8733 Decompile berry_powder.c 2019-03-24 14:50:16 -05:00
Marcus Huderle
456cc3a6f0 Split out the remaining wireless-related files 2019-03-24 13:15:37 -05:00
Marcus Huderle
4fd2b0b484 Decompile remaining functions in use_pokeblock.s 2019-03-23 17:23:14 -05:00
Wyrserth
6566a49beb Use constants for naming screen's pages. 2019-03-23 21:52:58 +01:00
Marcus Huderle
24e7269117 Match sub_81674BC 2019-03-23 11:22:41 -05:00
Marcus Huderle
fffdbe4e79 Match sub_8167420 2019-03-23 11:16:53 -05:00
Marcus Huderle
511ff2f20f Match sub_8166BEC and do some cleanup 2019-03-23 10:41:09 -05:00
Marcus Huderle
a5ee2c14fd Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
#	include/menu_specialized.h
2019-03-23 10:14:31 -05:00
Marcus Huderle
91fa5faf4a Match sub_8166564 2019-03-23 10:10:51 -05:00
Fontbane
e8add87bf3 Document Field Effects and some related text
Also VAR_TRICK_HOUSE_LEVEL
2019-03-23 09:57:37 -05:00
Fontbane
7d54c2b960 EventScript and Text Documentation
In event_script.s. Also renamed a couple events for consistency/detail.
2019-03-23 09:57:37 -05:00
DizzyEggg
cbdecf2f8d Make it compile 2019-03-23 09:51:27 -05:00
DizzyEggg
77c4856e62 Nonmatchings go away 2019-03-23 09:51:27 -05:00
Marcus Huderle
65391a1eb2 Merge remote-tracking branch 'upstream/master' into use_pokeblock
# Conflicts:
#	src/use_pokeblock.c
2019-03-23 09:39:46 -05:00
Marcus Huderle
a7d5f032b1 Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c 2019-03-22 14:16:26 -05:00
Marcus Huderle
f4f666f5af Finish decompiling ereader.c 2019-03-22 13:36:06 -05:00
Marcus Huderle
7118462b9f Decompile ereader.c up to faraway island code 2019-03-21 18:28:44 -05:00
Marcus Huderle
e9a3cc6d51 Merge remote-tracking branch 'upstream/master' into move-tutor
# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c
2019-03-17 17:20:40 -05:00
Marcus Huderle
4ae8a52473 Finish decompiling contest_painting_effects.c 2019-03-17 16:25:18 -05:00
Phlosioneer
f4737874ef Made a new substruct for the substruct
We must go deeper.
2019-03-16 22:10:07 -04:00
Phlosioneer
691392fd5d Clean up intro_credits_graphics constants 2019-03-16 12:37:04 -05:00
Phlosioneer
a029254faa Apply new macros to intro graphics struct 2019-03-16 12:37:04 -05:00
Phlosioneer
eeb329909c Fix anonymous struct 2019-03-16 12:37:04 -05:00
Phlosioneer
9848f84b9e Use constants for Oam .shape and .size fields
Also some general formatting fixes for constants.
2019-03-16 12:37:04 -05:00
Phlosioneer
291df27dcb Use new MUS_NONE constant in sound.c 2019-03-16 12:31:29 -05:00
Phlosioneer
703554c4df Ranges are magic 2019-03-16 12:25:02 -05:00
Phlosioneer
61344a4fee Document the water droplet data. 2019-03-16 12:25:02 -05:00
garak
d0115db565 move pokemon graphics to mon-specific directories 2019-03-16 12:21:47 -05:00
garak
14211fb495 fix incbin paths 2019-03-16 12:21:47 -05:00
Phlosioneer
bdc6ed1a98 Decompiled two difficult functions
Had do use a lot of `asm` directives for sub_81C8A28 to match.
2019-03-16 00:34:11 -04:00
Phlosioneer
8cea949e6d Move constant and EWRAM data into C. 2019-03-15 19:33:30 -04:00
Phlosioneer
a71c563b10 A few more functions decompiled 2019-03-15 02:33:55 -04:00
Phlosioneer
31ded7cc6f Merge branch 'master' into pokenav-decomp-again 2019-03-15 01:19:00 -04:00
Phlosioneer
7f70b629f5 Document sAreaGlowTilemapMapping
I used a script to generate the format for the array, so I can easily
change its formatting if needed.
2019-03-12 05:35:15 -04:00
Phlosioneer
8e1537fb57 Document map name popup flag 2019-03-10 09:23:58 -05:00
Phlosioneer
13c2f91b11 Moved last contest data into C 2019-03-09 23:51:39 -05:00
Phlosioneer
0c935a8bd5 Move the contest opponent filter to C 2019-03-09 22:54:17 -05:00
Phlosioneer
a32e8e7405 Move gContestOpponents into C
2,400 LOC by hand.
2019-03-09 20:56:36 -05:00
Phlosioneer
153499ed6f Clean up contest_opponents.inc 2019-03-09 01:38:38 -05:00
Phlosioneer
5b4b0a245b Move contest winner list to C 2019-03-09 00:01:49 -05:00
Phlosioneer
88c3781880 Move text pointer tables into C 2019-03-08 22:33:40 -05:00
Phlosioneer
b7cfa9d365 Move more contest constants into C 2019-03-08 21:39:51 -05:00
huderlem
32f71b2976
Merge pull request #600 from Phlosioneer/summary-screen-macros
Summary screen macros
2019-03-08 13:37:12 -06:00
Phlosioneer
c3feb9871f Use PIXEL_FILL macro 2019-03-08 04:02:05 -05:00
Phlosioneer
146c194b0c Actually change the variable name this time 2019-03-08 03:12:08 -05:00
Phlosioneer
5886f82ef5 Merge branch 'master' into extern-cleanup 2019-03-08 02:45:26 -05:00
Phlosioneer
eaddf396b2 I was dumb and forgot to add merge fixes 2019-03-08 02:35:19 -05:00
Phlosioneer
b93d923826 Merge branch 'master' into move-tutor 2019-03-08 02:27:20 -05:00
Phlosioneer
eac70acab6 Change filename to something more descriptive 2019-03-08 02:17:01 -05:00
Phlosioneer
af182d6f16 Minor cleanup before pushing 2019-03-08 02:10:44 -05:00
Phlosioneer
69aec91577 Decompile move tutor stuff
2 nonmatching.
2019-03-08 01:56:38 -05:00
Marcus Huderle
bd157b301d Scaninc: Don't insert missing headers into dependencies 2019-03-07 09:46:14 -06:00
Phlosioneer
105e1721d6 Overhaul scaninc to work recursively
This also fixes the bug where scaninc would ignore #include lines
in assembly files.
2019-03-07 08:46:55 -06:00
Phlosioneer
aa7657a82a Move constants into C
Also figured out what one of the graphics files is for.
2019-03-06 22:58:05 -05:00
Phlosioneer
0da83abad2 Several nonmatching functions
Huge and difficult.
2019-03-06 22:27:30 -05:00
Phlosioneer
4345ba8e6c More decompiled and cleanup 2019-03-05 22:32:28 -05:00
Phlosioneer
c3594f982d Decompiling pokeblock ui stuff 2019-03-05 20:32:14 -05:00
DizzyEggg
e79b6f747b Fix Controllers end command function names 2019-03-05 20:07:59 +01:00
Diegoisawesome
842e3c8b42
Merge pull request #605 from DizzyEggg/rename
Rename an erroneously named battlescript
2019-03-05 10:41:30 -06:00
DizzyEggg
596d85bcbd What is love, baby dont hurt me 2019-03-05 17:07:37 +01:00
DizzyEggg
b150091436 Rename an erroneously named battlescript 2019-03-05 17:06:29 +01:00
DizzyEggg
b9c216638c try flying 2019-03-05 16:52:40 +01:00
Phlosioneer
9bea9e1624 Start decompiling menu_unknown 2019-03-05 06:06:20 -05:00
DizzyEggg
3507ac3974 Start fixing flying.c 2019-03-05 09:02:05 +01:00
Phlosioneer
907492fd6e Split rom asm file in half
The first half is ui/menu stuff, while the second half is link-related
stuff.
2019-03-04 23:26:51 -05:00
Phlosioneer
cae63cf1c7 Rename move tutor to move relearner 2019-03-04 20:56:39 -05:00
Phlosioneer
ac7a048380 Removed PREV and NEXT macros, changed summary name 2019-03-04 00:25:07 -05:00
Phlosioneer
05199f8fc7 Fix merge issue 2019-03-03 22:27:57 -05:00
garak
1758eb99df match sub_810EE14 in flying.c 2019-03-03 22:08:58 -05:00
Phlosioneer
2879fe7fe0 Merge branch 'master' into summary-screen-macros 2019-03-03 16:58:54 -05:00
Phlosioneer
63e700af6c Use macros for summary windows
Other minor changes and fixes are included
2019-03-03 16:50:51 -05:00
shinny456
1e7f4a80c7 port the rest of flying (leave 2 nonmatchings to egg) 2019-03-03 09:33:19 -06:00
Phlosioneer
4ea5e85bed Fix typos
This is an updated version of #554, since it hasn't been updated in two
weeks.
2019-03-03 09:31:47 -06:00
Phlosioneer
e03595a10d Bugfixes from #591 2019-03-03 09:31:08 -06:00
Phlosioneer
4907ce6f7f Fully document move_tutor (formerly learn_move) 2019-03-03 02:50:40 -05:00
Phlosioneer
9372731c3e Merge branch 'master' into main-menu-state-machine 2019-03-02 17:35:44 -05:00
Phlosioneer
3716da5430 Rename macro with correct name for pixel values 2019-03-02 17:25:39 -05:00
Phlosioneer
80a4ee1145 Remove water.h and flying.h 2019-03-02 17:23:10 -05:00
DizzyEggg
043071ae12 Don't extern gMoveNames 2019-03-02 08:25:14 -06:00
huderlem
ee9694d9ba
Merge pull request #587 from Phlosioneer/document-all-event-vars
Document all event vars
2019-03-02 08:24:46 -06:00
Phlosioneer
25050b9944 Fix tabs, do suggested rename 2019-03-02 04:13:27 -05:00
Phlosioneer
49bef25856 Clean up the last extern functions 2019-03-02 03:18:08 -05:00
Phlosioneer
ee69426838 Eliminate more externs 2019-03-02 02:44:02 -05:00
Phlosioneer
0f6cc27e81 Fixed decomp issue around LoadPalette
In LoadLinkPartnerEventObjectSpritePalette, using paletteNum += 6 causes
GCC to "mark" paletteNum's register as a possible overflow, even though
it performs the overflow check. Then, when passing args to LoadPalette,
GCC fails to recognize that 0x100 + ((any u8) << 4) can never overflow
as a u16. It then does an overflow check before calling LoadPalette.

Assigning to a temp variable seems to avoid this "marking" behavior.
2019-03-02 00:36:59 -05:00
Phlosioneer
3ceb1667c9 Reduce externs 2019-03-01 22:32:50 -05:00
huderlem
3b04cfa437
Merge pull request #551 from Phlosioneer/multiplayer-stuff
Document overworld.c and link stuff in general
2019-03-01 08:43:55 -06:00
Phlosioneer
a7e5852f1d More minor fixes 2019-03-01 01:49:11 -05:00
Phlosioneer
459fd93b59 Fix minor errors 2019-03-01 01:18:58 -05:00
Phlosioneer
da0687987d Pick better names for constants 2019-02-28 22:21:16 -06:00
Phlosioneer
189d387f01 Add macros for metatile manipulation 2019-02-28 22:21:16 -06:00
hondew
53d7e21332 fix formatting in slot_machine.c 2019-02-28 21:21:56 -06:00
hondew
1dc0d346d9 fix spelling error 2019-02-28 21:21:56 -06:00
hondew
dd8ecabe26 fix mistakes and bad formatting 2019-02-28 21:21:56 -06:00
hondew
f965f1b13d label luckyFlags 2019-02-28 21:21:56 -06:00
hondew
a6eb879267 minor reeltime changes 2019-02-28 21:21:56 -06:00
hondew
47a3477ab1 finish DecideReelTurns 2019-02-28 21:21:56 -06:00
hondew
f8f046c850 clean up slot machine more 2019-02-28 21:21:56 -06:00
hondew
67fe781ed2 clean up slot machine until AwardPayout 2019-02-28 21:21:56 -06:00
hondew
5c8cc5225f document slot machine 2019-02-28 21:21:56 -06:00
DizzyEggg
baf95a8e7a get rid of ugly cast 2019-02-28 17:26:09 -06:00
Phlosioneer
99bfd8c80f VAR_0x3F20 is not a var 2019-02-28 00:10:44 -05:00
Phlosioneer
bf45b83c65 Finish documenting event vars 2019-02-27 23:54:51 -05:00
Phlosioneer
782979f1fc Finish documenting trainer hill
Trainer hill isn't anywhere close to done, but I figured out enough
to name the VAR. That's all this PR should do.
2019-02-27 22:16:01 -05:00
Phlosioneer
66f0616a2d I guess I'm documenting Trainer Hill now 2019-02-27 21:31:05 -05:00
Phlosioneer
e77e7844ea Name several vars, document some related events 2019-02-27 20:25:09 -05:00
Phlosioneer
648fc3d4f3 Name more unknown vars 2019-02-27 15:18:56 -05:00
Phlosioneer
4137dd7b0b Identify unused, never read, and never written vars 2019-02-27 14:42:32 -05:00
Marcus Huderle
4b9e93850c Document easy chat screen types 2019-02-27 12:55:29 -06:00
Phlosioneer
c1348d22f3 Name most event scripts related to unusual weather 2019-02-27 04:27:54 -05:00
Phlosioneer
fe55580fe1 Reverse engineer unusual weather events 2019-02-27 03:42:04 -05:00
Phlosioneer
2e789dbbdc Decompile another 7 functions 2019-02-27 02:11:45 -05:00
Phlosioneer
b2c92ee8c5 Missed some fill values
Must have forgotten to check FillWindowPixelRect.
2019-02-26 22:45:39 -05:00
Phlosioneer
72bb0daccb Merge branch 'master' into main-menu-state-machine 2019-02-26 22:34:42 -05:00
Phlosioneer
6cb4c677cd Fix backwards names 2019-02-26 22:30:40 -05:00
Phlosioneer
3a44b090d1 Merge branch 'master' into multiplayer-stuff 2019-02-26 22:07:29 -05:00
Phlosioneer
accea672f1 Incorporate feedback 2019-02-26 22:04:44 -05:00
Marcus Huderle
231355f84d Decompile easy_chat data 2019-02-26 14:50:02 -06:00
Marcus Huderle
b60611c38e Finish decompiling easy_chat.c code 2019-02-26 14:50:02 -06:00
DizzyEggg
7742e28dad Easy chat nonmatchings fix
do {} while(0);
2019-02-26 09:15:20 -06:00
huderlem
153f134318
Merge pull request #583 from huderlem/easy_chat
Decompile more easy_chat.c
2019-02-25 14:12:18 -06:00
Marcus Huderle
7ea05431a5 Decompile more easy_chat.c 2019-02-25 14:11:31 -06:00
huderlem
d77ba3d413
Merge pull request #581 from arantonitis/pokemon_summary
Documented/polished pokemon_summary_screen.c
2019-02-25 08:09:14 -06:00
huderlem
b3a7a1278a
Merge pull request #577 from Phlosioneer/weather-15
Document the weather state functions
2019-02-25 08:03:22 -06:00
huderlem
84573f1774
Merge pull request #574 from Phlosioneer/event-vars
Event vars
2019-02-25 08:02:28 -06:00
Phlosioneer
a5cf2b8090 Use map script constants in map script functions 2019-02-25 08:01:22 -06:00
Phlosioneer
5f7a971313 Source file part of map script renaming 2019-02-25 08:01:22 -06:00
Phlosioneer
1cd5cb09cf Merge branch 'master' into weather-15 2019-02-25 02:30:35 -05:00
Phlosioneer
e1b2460748 Adjust formatting, rename function 2019-02-25 02:28:41 -05:00
Phlosioneer
4e5fae0086 Merge branch 'master' into event-vars 2019-02-25 02:24:20 -05:00
Phlosioneer
c03b13b855 Decompiled more, got one NONMATCHING 2019-02-25 01:02:16 -05:00
Tustin2121
4a785e66ba Changing descriptions to not be file names 2019-02-24 10:20:31 -06:00
tustin2121
8711bc5156 Document HEALTHBOX_GRX_* in battle_interface.c
Most of these are referenced via offsets, like the HP bar, which uses [0 pixels] + (number of pixels) to reference which chunk to draw. Each corresponds to a 16x16 pixel in the graphic named. Up to you guys if you want to rename the constants.
2019-02-24 10:20:31 -06:00
Marcus Huderle
bb508ade64 Decompile more of easy_chat.c 2019-02-24 10:09:57 -06:00
Phlosioneer
a25f4c75bc Decompiled a weird function 2019-02-24 04:33:58 -05:00
Phlosioneer
62589d7003 Decompiled more, ported asmdiff to powershell 2019-02-24 03:33:33 -05:00
Phlosioneer
a7d2d986b2 Decompiled two small functions, updated structs 2019-02-23 23:38:32 -05:00
Phlosioneer
fb8dddf0f1 Decompiled sub_81C81D4 2019-02-23 23:17:26 -05:00
Ariel Antonitis
0c47744a63 Moved ALIGNED(4) from extern to unknown struct. 2019-02-23 22:22:38 -05:00
Ariel Antonitis
d24cd4f0a8 Fixed broken encoding. 2019-02-23 22:04:21 -05:00
Ariel Antonitis
42bb5dc53d Removed unused filler by aligning adjacent variables 2019-02-23 21:55:24 -05:00
Ariel Antonitis
74a3c06270 Documented/polished pokemon_summary_screen.c
Mostly variables mislabeled as global and some formerly unknown stuff.
2019-02-23 21:12:35 -05:00
Diegoisawesome
7995cf5b61
Merge pull request #578 from DizzyEggg/pokenav
pokenav
2019-02-23 16:04:59 -06:00
Marcus Huderle
f34903bc45 Decompile more easy_chat.c 2019-02-23 13:05:34 -06:00
ultima-soul
eb48cc2f7e Decompile through sub_8167930. 2019-02-23 09:08:07 -08:00
DizzyEggg
788caa4fe2 pokenav 2019-02-23 13:34:01 +01:00
Phlosioneer
b2866fae21 Document the weather state functions
All weather types are now documented (including WEATHER_15)
2019-02-22 22:20:42 -05:00
Marcus Huderle
d3f66a98ff Decompile more easy_chat 2019-02-22 11:46:05 -06:00
Phlosioneer
cea5696f23 Finish moving pokeruby vars 2019-02-22 04:18:43 -05:00
Phlosioneer
e12a7790cf Start porting pokeruby vars to pokeemerald 2019-02-22 04:01:38 -05:00
Phlosioneer
44e92ce259 Give window drawing functions better names 2019-02-22 01:40:11 -05:00
Phlosioneer
199863f21f Replace more instances of fill values 2019-02-21 23:56:22 -05:00
Phlosioneer
c96f8751cd Improve window palette macros 2019-02-21 23:27:12 -05:00
Phlosioneer
399d646e3f Merge branch 'master' into main-menu-state-machine 2019-02-21 22:24:25 -05:00
Phlosioneer
eca329f9c5 Merge branch 'master' into multiplayer-stuff 2019-02-21 21:22:10 -05:00
Marcus Huderle
b105d20d1e Decompile chunk of easy_chat.c 2019-02-21 17:46:14 -06:00
Marcus Huderle
1c6502338e Decompile contest_link_80F57C4.c 2019-02-20 18:11:27 -06:00
Marcus Huderle
4223bb65f0 Decompile several contest_link_80F57C4.c functions 2019-02-19 16:36:42 -06:00
Marcus Huderle
05f9368154 Decompile start of flying.c 2019-02-19 16:36:42 -06:00
Diegoisawesome
1b0079445d
Merge pull request #559 from Phlosioneer/finish-newgame-docs
Finish and polish new_game.c
2019-02-18 13:28:50 -06:00
Diegoisawesome
924cbe9ee4
Merge pull request #560 from Phlosioneer/regi-documentation
Document the regi* code more
2019-02-18 13:23:19 -06:00
Phlosioneer
486cf449b8 Make flag names more consistent 2019-02-18 14:17:02 -05:00
Phlosioneer
bfe67842ab Fix spelling (again) 2019-02-18 14:14:07 -05:00
Phlosioneer
fcb541189d Rename some flags, and use map ID macros 2019-02-18 02:02:20 -05:00
Diegoisawesome
047d8288cc
Merge pull request #557 from Phlosioneer/navgear-decompile
Navgear decompile
2019-02-18 00:34:01 -06:00
Phlosioneer
93e9b9fe5d Fix some names 2019-02-18 01:33:41 -05:00
Phlosioneer
0a7b97ee06
Merge branch 'master' into multiplayer-stuff 2019-02-18 01:19:16 -05:00
Phlosioneer
5695617d64 Merge branch 'master' into multiplayer-stuff 2019-02-18 01:12:47 -05:00
Phlosioneer
40d4f7f8db Minor fixes 2019-02-18 01:10:59 -05:00
Phlosioneer
08579edbcd Clean up mistakes and bad formatting 2019-02-18 01:03:44 -05:00
Phlosioneer
7ad225a72f Address formatting issues and use constants 2019-02-18 00:16:27 -05:00
Phlosioneer
f528552583 Rename pokenav file 2019-02-17 23:14:14 -05:00
Phlosioneer
762640664f Fix formatting 2019-02-17 23:14:14 -05:00
Phlosioneer
bfeb7fb32a Tabs converted to spaces.
Oops.
2019-02-17 23:14:14 -05:00
Phlosioneer
fbcfb69fe6 Remove guess code, fix pointer formatting 2019-02-17 23:14:14 -05:00
Phlosioneer
197ad274b4 Reformat braces 2019-02-17 23:14:14 -05:00
Phlosioneer
be08a662a8 More data moved into C code 2019-02-17 23:14:14 -05:00
Phlosioneer
a4aaf279ac Move more data into pokenav, name some strings 2019-02-17 23:14:14 -05:00
Phlosioneer
bf4c1a73c0 Start moving pokenav data into C files
The types and usage of many of the globals are now known.
2019-02-17 23:14:14 -05:00
Phlosioneer
758b8c7f0e Decompiled three more functions. 2019-02-17 23:14:14 -05:00
Phlosioneer
6d929c61c5 Decompiled 4 more functions 2019-02-17 23:14:14 -05:00
Phlosioneer
cb800e4708 Decompiled 5 functions
Was unable to decompile sub_81C79BC.
2019-02-17 23:14:14 -05:00
Phlosioneer
d41c597f90 Decompiled sub_81C7990 2019-02-17 23:14:14 -05:00
Phlosioneer
f95eebf47a With help, sub_81C795C has been tamed.
Thanks to Garak on the discord server.
2019-02-17 23:14:14 -05:00
Phlosioneer
a8d920cc45 Decompiled 2 functions, unable to decompile 1.
sub_81C795C could not be decompiled due to register naming issues.
However, its structure was correctly matched, so I have left the C
code and a comment explaining the issue.
2019-02-17 23:14:14 -05:00
Phlosioneer
34b16e9e78 Decompiled 5 functions for unknown structs 2019-02-17 23:14:14 -05:00
Phlosioneer
3bb4057bad Decompiled sub_81C7764 2019-02-17 23:14:14 -05:00
Phlosioneer
7c405e08d0 Decompiled three more small functions 2019-02-17 23:14:14 -05:00
Phlosioneer
5beb2baa97 Decompiled sub_81C76C4 2019-02-17 23:14:14 -05:00
Phlosioneer
b038556851 Decompiled several setters and getters 2019-02-17 23:14:14 -05:00
Phlosioneer
13a6765c88 Decompiled several trivial functions 2019-02-17 23:14:14 -05:00
Phlosioneer
112fc47017 Decompiled sub_81C756C
Also discovered a constant that may be useful for future decompiling.
Comments were added in the asm that references the constant.
2019-02-17 23:14:14 -05:00
Phlosioneer
3d73f7c48c Decompiled sub_81C742C 2019-02-17 23:14:14 -05:00
Phlosioneer
cf721879dd Decompiled sub_81C7418 2019-02-17 23:14:14 -05:00
Phlosioneer
323df8ed40 Decompiled sub_81C7400 2019-02-17 23:14:14 -05:00
Phlosioneer
729e7116f2 Decompiled AnyMonHasRibbon 2019-02-17 23:14:14 -05:00
Phlosioneer
5441d80ebc Decompiled sub_81C7360 2019-02-17 23:14:14 -05:00
Phlosioneer
aa61e105e0 Decompiled sub_81C7334 2019-02-17 23:14:14 -05:00
Phlosioneer
d52cbe6bcb Decompiled sub_81C72BC 2019-02-17 23:14:14 -05:00
Phlosioneer
9bda2297e3 Decompiled sub_81C72A4 2019-02-17 23:14:14 -05:00
Phlosioneer
cd84c92cfa Decompiled CB2_PokeNav 2019-02-17 23:14:14 -05:00
Phlosioneer
69b014f7aa Decompiled sub_81C71E4 2019-02-17 23:14:14 -05:00
Phlosioneer
fb705e6047 Decompiled sub_81C7170. 2019-02-17 23:14:14 -05:00
Phlosioneer
6466d0bea8 Decompiled sub_81C7124 2019-02-17 23:14:14 -05:00
Phlosioneer
052cd4da10 Decompiled sub_81C70D8 2019-02-17 23:14:14 -05:00
Phlosioneer
698c2879e4 Decompiled sub_81C7078 2019-02-17 23:14:14 -05:00
Diegoisawesome
367c7b5f89
Merge pull request #558 from Phlosioneer/check-pokedex-asm
Add comments explaining the remaining asm in pokedex.c
2019-02-17 12:59:52 -06:00
garak
22657c7087 use BG_SCREEN_ADDR macro for tilemap addresses 2019-02-17 00:35:26 -05:00
garak
35575b57a0 use BG_CHAR_ADDR define 2019-02-16 23:51:06 -05:00
Phlosioneer
e90e3458cb Document the regi* code more
Fixed some confusing naming, named some unknown symbols, and fixed the
names of some flags.
2019-02-15 18:24:55 -05:00
Phlosioneer
986d3d8b2f Finish and polish new_game.c
Only one function is left undocumented. I tried to go into the assembly
to at least name it, but it clears fields in the save block that aren't
even documented yet.
2019-02-15 03:40:57 -05:00
Phlosioneer
0a3912c95d Add comments explaining asm in pokedex.c
I added comments to each of the asm functions explaining why they won't
match with the C.
I also got one of the functions much closer to matching.
2019-02-15 01:28:28 -05:00
Phlosioneer
9e8a841bfa Merge branch 'master' of github.com:pret/pokeemerald into main-menu-state-machine 2019-02-13 23:04:56 -05:00
Diegoisawesome
047c282763
Merge pull request #548 from Phlosioneer/intro-movie-state-machine
Document the intro movie state machine
2019-02-13 21:24:20 -06:00
Phlosioneer
e7d0268143 Fix spelling of Rayquaza 2019-02-13 21:41:28 -05:00
Diegoisawesome
aa5d5fa34a
Merge pull request #550 from Phlosioneer/name-palette-return-values
Name the possible return values of palette fading functions
2019-02-13 20:15:47 -06:00
Diegoisawesome
dfb896356c Merge branch 'master' of github.com:pret/pokeemerald 2019-02-12 00:40:42 -06:00
Diegoisawesome
449fb25f23 Clear up misnamed time-based flags and functions 2019-02-12 00:40:34 -06:00
Phlosioneer
d979ac3bf3 Document main_menu state machine, name window constants
The new names for the constants (and newly named functions) give a much
better understanding of what the window system is trying to do.
2019-02-11 00:34:50 -05:00
Phlosioneer
327de0283d Adjust constants returned by FlipVerticalAndClearForced 2019-02-10 21:16:12 -05:00
Phlosioneer
e75f45dbcf Reverse engineered many of the multiplayer events
Some corrections to the way events are handled and identified.
2019-02-10 20:42:50 -05:00
Phlosioneer
f2f1b1978b Done documenting link code in overworld.c 2019-02-10 03:54:50 -05:00
Phlosioneer
3fd878483f Start renaming symbols
I finally figured out what the code is trying to do. I have a foothold;
the rest should follow.
2019-02-10 00:50:46 -05:00
Phlosioneer
37bea25b01 Name the possible return values of palette fading functions
Also replace implicit conversion from gPalette.active into a status with
if statements, to make the return value clear.

I've also added comments when the check is redundant.
2019-02-09 21:50:12 -05:00
Phlosioneer
45297797e6 Document the intro movie state machine
Need to study the water droplet animation more closely before they can
be renamed; otherwise, this names every major symbol in this file.
2019-02-09 21:07:07 -05:00
Marcus Huderle
6f1d2b870c Give proper names to dynamic map layouts 2019-02-09 09:57:30 -06:00
Marcus Huderle
40dc6833c5 Fully document tileset animations 2019-02-08 15:07:42 -06:00
Marcus Huderle
abebd2b864 Cleanup externs in overworld.c 2019-02-08 11:48:51 -06:00
Marcus Huderle
6add3e1794 Document some battle dome stuff 2019-02-08 11:08:25 -06:00
Marcus Huderle
4570e3b6a5 Document battle arena 2019-02-08 09:41:36 -06:00
Marcus Huderle
3a40f5203b Remove old rom_818CFC8.h header 2019-02-07 17:41:44 -06:00
Marcus Huderle
85040e26fd Document battle pike 2019-02-07 17:37:41 -06:00
Marcus Huderle
4785a07acd Document battle factory functions 2019-02-07 12:58:09 -06:00
Marcus Huderle
b52871433a Fix typo 2019-02-07 11:54:51 -06:00
Marcus Huderle
3a88ab831d Document more battle pyramid 2019-02-07 11:51:03 -06:00
Marcus Huderle
a1ad1bad3a Document a bunch of battle pyramid 2019-02-06 21:14:28 -06:00
Marcus Huderle
1253cbf5f6 Document some battle anim things 2019-02-06 21:14:28 -06:00
huderlem
b0ee100975
Merge pull request #543 from pret/mapdata
Convert map data to JSON
2019-02-04 21:36:18 -06:00
Diegoisawesome
646533cfa3
Merge pull request #542 from Slawter666/pss
Label some summary screen functions
2019-02-04 09:46:39 -06:00
Slawter666
fa352cfda3 Some more labelling 2019-02-04 14:35:49 +00:00
Slawter666
3d79aeb9da More documentation 2019-02-04 12:44:09 +00:00
Slawter666
804e955c8d Label some more functions 2019-02-04 11:38:44 +00:00
Slawter666
031fd66393 Label some summary screen functions 2019-02-02 22:14:04 +00:00
Diegoisawesome
ff48e5ada0
Merge pull request #541 from Diegoisawesome/master
Misc documentation
2019-02-02 16:00:56 -06:00
Diegoisawesome
d64a905d65 Document trainer backsprites 2019-02-02 15:56:22 -06:00
Diegoisawesome
59807c0f2c
Merge pull request #536 from DizzyEggg/menu
Use Menu and List Menu input defines
2019-02-02 12:45:35 -06:00
DizzyEggg
ea79f1c8f6 tabs 2019-02-02 19:41:34 +01:00
Diegoisawesome
e8952c2374
Merge pull request #539 from DizzyEggg/ram_vars
Move ram vars in sym files to C
2019-02-02 11:17:50 -06:00
Diegoisawesome
47c105bef6
Merge pull request #538 from DizzyEggg/data
Dump last battle anim file
2019-02-02 11:12:29 -06:00
DizzyEggg
363fa9bed2 Clean up ram vars 2019-02-02 12:44:00 +01:00
DizzyEggg
a7f94bbeea Dump last battle anim file 2019-02-02 11:55:11 +01:00
DizzyEggg
a740bc7190 Name action 11 2019-02-02 11:32:00 +01:00
DizzyEggg
23b240ab65 Fix Menu and List Menu input defines 2019-02-02 11:04:38 +01:00
Diegoisawesome
46a3969f69 Add constants for flags and vars 2019-02-02 00:25:43 -06:00
Diegoisawesome
9d8a43a1fb
Merge pull request #534 from DizzyEggg/patch-1
Get rid of an unnecessary extern
2019-02-01 14:51:04 -06:00
DizzyEggg
b3d48c0ed6
Get rid of an unnecessary extern 2019-02-01 19:45:06 +01:00
DizzyEggg
d02a788d2e Match GetItemEffectType 2019-02-01 19:25:10 +01:00
Diegoisawesome
b26c24ffee
Merge pull request #532 from DizzyEggg/bored
Fix some fakematches
2019-02-01 10:04:42 -06:00
DizzyEggg
c0db311637 some more fakematch fix 2019-02-01 12:26:40 +01:00
DizzyEggg
e3bec4b480 fix nonmatch in mauville old man 2019-02-01 11:56:02 +01:00
DizzyEggg
7c8fb66acf Fix field player avatar fakmatch 2019-02-01 11:50:45 +01:00
DizzyEggg
5dfaf22fb3 Fix pokemon icon asm 2019-02-01 11:39:24 +01:00
DizzyEggg
b4055e4fc0 Merge m4a files into one, get rid of one asm 2019-02-01 10:37:13 +01:00
DizzyEggg
7750a8126d CgbSound is decompiled. 2019-02-01 00:25:31 +01:00
Marcus Huderle
29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00
Diegoisawesome
3f1a7330dd Document siirtc a bit more 2019-01-30 19:48:28 -06:00
DizzyEggg
d46e60765d Rename a palace battle field 2019-01-29 22:22:02 +01:00
Marcus Huderle
8f832434e5 Change drought colors table files to .bin 2019-01-29 14:36:02 -06:00
Marcus Huderle
36a1825bbe Document trainer approach funcs, and use movement type constants in scripts 2019-01-29 14:36:02 -06:00
Marcus Huderle
e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
DizzyEggg
73d919fa0f Define double single left right qutoation marks char 2019-01-28 19:02:34 +01:00
DizzyEggg
922726ff3d contest 2019-01-28 18:19:58 +01:00
DizzyEggg
ad59811154 Decompile whole contest 2019-01-28 18:13:07 +01:00
DizzyEggg
26a2a4f9e7 Match all of contest functions 2019-01-28 12:29:47 +01:00
Diegoisawesome
183b6857ff
Merge pull request #458 from ultima-soul/contest
Decompile more of contest
2019-01-27 23:08:24 -06:00
ultima-soul
72720204da Fix stuff 2019-01-27 20:54:21 -08:00
ultima-soul
d633ee6f58 Minor changes 2019-01-27 20:48:18 -08:00
ultima-soul
f828823bf0 Make changes 2019-01-27 20:21:30 -08:00
DizzyEggg
54ddbaaf0c Frontier pass clean-up 2019-01-26 22:09:24 +01:00
DizzyEggg
251d16b733 Make Frontier pass compile 2019-01-26 21:06:20 +01:00
DizzyEggg
01c3f3fc05 Document all of frontier pass 2019-01-26 20:56:06 +01:00
DizzyEggg
03549349f8 Decompile all frontier pass 2019-01-26 19:20:14 +01:00
DizzyEggg
0688725afb Document and decompile more of frontier pass. 2019-01-26 14:50:24 +01:00
DizzyEggg
08a3533682 Start frontier pass 2019-01-25 23:32:45 +01:00
DizzyEggg
ebfaf3f6be Merge branch 'master' into dump 2019-01-24 21:30:19 +01:00
DizzyEggg
b6e5b4ee1a trainer card diego pls 2019-01-22 21:56:57 +01:00
garak
261955b6ed trainer hill easy chat constants 2019-01-21 12:01:49 -05:00
DizzyEggg
75a1c022dd Make trainer card compile 2019-01-20 18:48:29 +01:00
DizzyEggg
4e396207d3 document more of trainer card 2019-01-20 18:24:35 +01:00
DizzyEggg
576d1b3474 Document and match somne trainer card 2019-01-19 23:04:33 +01:00
shinny456
f06c0749bc trainer_card up to sub_80C4998 2019-01-19 12:14:59 -05:00
shinny456
1b30da21d9 merge trainer hill changes 2019-01-19 10:44:58 -05:00
DizzyEggg
f84b22fca4 Dump trainer hill trainers 2019-01-19 12:57:18 +01:00
DizzyEggg
87763d133f bites to bits 2019-01-14 20:57:44 +01:00
DizzyEggg
353ad13f91 make trainer hill compile 2019-01-13 20:58:42 +01:00
DizzyEggg
4b420643dc Merge branch 'master' into trainer_hill 2019-01-13 20:51:05 +01:00
DizzyEggg
edddd847c5 Document and clean up trainer hill 2019-01-13 20:50:08 +01:00
DizzyEggg
c0bc01d301 Move some vars to C 2019-01-13 13:15:23 +01:00
DizzyEggg
11a49a7f02 Decompile trainer hill 2019-01-13 12:12:27 +01:00
shinny456
8a5fce7837 start decompiling trainer_card.s 2019-01-08 21:51:19 -05:00
Diegoisawesome
af2c39860d Rename non-mapsec constants 2019-01-08 13:40:11 -06:00
ultima-soul
b8ff71e65e Fix build conflicts. 2019-01-06 14:11:31 -08:00
ultima-soul
284751e761 Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present. 2019-01-06 13:41:18 -08:00
ultima-soul
2ca482dc24 Committing progress so far. 2019-01-06 13:38:31 -08:00
ultima-soul
f966b65849 Through sub_80DC028, sub_80DC0F4 non-matching. 2019-01-06 13:32:48 -08:00
ultima-soul
76510d58bb Matched up to sub_80DBF68, sub_80DBF90 WIP. 2019-01-06 13:32:47 -08:00
Slawter666
aeaf390706 Update constants 2019-01-05 20:12:50 +00:00
Slawter666
f8c2fcb9b2 Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base 2019-01-05 19:54:26 +00:00
DizzyEggg
50a26bffe4 tabs to spaces 2019-01-05 19:27:23 +01:00
DizzyEggg
b756996581 fakematch and nonmatch 2019-01-05 19:25:46 +01:00
Marcus Huderle
95db853a78 Decompile more of contest_link_80F57C4.c 2019-01-04 20:03:29 -06:00
Philipp AUER
55202eac24 rename coords to size in struct MonCoords 2019-01-04 19:59:55 -06:00
huderlem
cba2f81bf8
Merge pull request #507 from Tetrable/master
Finish off labeling flags
2019-01-03 20:37:25 -06:00
Marcus Huderle
fd201f8395 Start decompiling contest_link_80F57C4.c 2019-01-03 20:35:20 -06:00
Marcus Huderle
2857f7fff9 Decompile contest_link_81D9DE4.c 2019-01-03 20:35:20 -06:00
Marcus Huderle
bc43dbab13 Decompile contest_link_81D9DE4.c 2019-01-03 20:35:20 -06:00
Tetrable
30e7ac0dca Fix merge conflicts 2019-01-03 02:28:18 +00:00
Tetrable
50aa222aff Corrected typos 2019-01-03 01:54:55 +00:00
Marcus Huderle
b471bba55e Use better names for match call texts 2019-01-02 19:46:15 -06:00
Marcus Huderle
e1092028ec Decompile match_call.c 2019-01-02 19:46:15 -06:00
Diegoisawesome
f8c708a82a
Merge pull request #506 from Slawter666/menu
Minor labelling of menu.c
2019-01-02 17:29:27 -06:00
Diegoisawesome
0053e61535
Merge pull request #504 from Diegoisawesome/roulette
Port/decompile roulette
2019-01-02 17:00:33 -06:00
Diegoisawesome
a0188aac33 Cleanup and EWRAM 2019-01-02 16:55:50 -06:00
Diegoisawesome
6202ae1df0 Extract rodata from roulette 2019-01-02 16:40:40 -06:00
Tetrable
a3ebca4d81 Fix merge conflicts 2019-01-02 21:25:14 +00:00
Tetrable
1e3da62d24 Finish off labelling flags 2019-01-02 21:12:43 +00:00
Slawter666
99c37023c8 Minor labelling of menu.c 2019-01-02 01:11:02 +00:00
Slawter666
ee5a239534 Use constants in secret_base.c 2019-01-01 23:19:07 +00:00
Diegoisawesome
e7f8190ba3 Finish roulette port 2019-01-01 15:25:52 -06:00
Diegoisawesome
d28d8c850d Up to sub_81446DC 2018-12-31 19:39:41 -06:00
Diegoisawesome
af1e44befe Continue porting roulette 2018-12-31 18:07:29 -06:00
Marcus Huderle
a0ff38d0be Fix build 2018-12-31 16:53:38 -06:00
Marcus Huderle
05b1d2ea94 Document field_tasks.c 2018-12-31 16:53:38 -06:00
Marcus Huderle
b6ee970e7a Minor berry.c cleanup 2018-12-31 16:53:38 -06:00
Marcus Huderle
fb2d1591c1 Document more battle anim effects 2018-12-31 16:53:38 -06:00
Diegoisawesome
439fa13e94 Start porting/decompiling roulette 2018-12-31 16:09:45 -06:00
Diegoisawesome
17ac8e29ef
Merge pull request #497 from garakmon/rm_sec
index gRegionMapEntries by map section constants
2018-12-31 11:51:12 -06:00
Diegoisawesome
d004ce065c Merge branch 'master' of github.com:pret/pokeemerald into trade 2018-12-31 02:30:30 -06:00
Diegoisawesome
ec780bb209 Cleanup and documentation 2018-12-31 02:22:21 -06:00
Diegoisawesome
c5c6e437ec Document, cleanup, extract data from trade 2018-12-31 01:23:27 -06:00
Marcus Huderle
58f130d007 Document some battle anims and helpers 2018-12-30 11:04:17 -06:00
garak
ed25326140 fix formatting 2018-12-29 21:52:38 -05:00
garak
1baa17c632 index gRegionMapEntries by map section constants 2018-12-29 21:49:29 -05:00
Diegoisawesome
c22a12d8d6 trade source done 2018-12-29 13:50:24 -06:00
Diegoisawesome
2fb9f490fb Almost done with trade 2018-12-29 12:46:15 -06:00
DizzyEggg
b2a042f65c
Match and clean up battle anim 3 2018-12-29 19:31:04 +01:00
DizzyEggg
0d5a0b58fa Fakematch a function 2018-12-29 11:51:00 -06:00
DizzyEggg
75b4e9ac70 compile contest 2018-12-29 11:48:28 -06:00
DizzyEggg
55e44b0951 a bit more of contest painting effect 2018-12-29 11:48:28 -06:00
DizzyEggg
34243bbe1d Start contest painting effect 2018-12-29 11:48:28 -06:00
PALPATlNE
061b879561 Documentation for pokemon_summary_screens.c 2018-12-29 11:45:06 -06:00
Marcus Huderle
229177f7c6 Use anim weather constants 2018-12-29 11:40:12 -06:00
Marcus Huderle
8eea0925c5 Finish battle_anim_effects_3.c 2018-12-29 11:40:12 -06:00
Marcus Huderle
d0d870e193 Cleanup formatting 2018-12-29 11:36:54 -06:00
Marcus Huderle
6e7bdb3ca4 Document misc field_specials things 2018-12-29 11:36:54 -06:00
Marcus Huderle
67636b7c64 Document deoxys rock 2018-12-29 11:36:54 -06:00
Marcus Huderle
46d41d2fb9 Use EVENT_OBJ_ID_PLAYER in C code 2018-12-29 11:36:54 -06:00
Marcus Huderle
95dcff581b Document some fieldmap stuff 2018-12-29 11:36:54 -06:00
Diegoisawesome
146ad2bdd4 Next big honkin' function done 2018-12-28 13:42:34 -06:00
Diegoisawesome
9cad5e8197 Big switch mofo 2018-12-28 02:11:41 -06:00
Marcus Huderle
d59f5a8e56 Misc overworld documentation 2018-12-27 16:52:13 -06:00
Marcus Huderle
2c0f5f58e9 Use constants for warp into MAP_INSIDE_OF_TRUCK 2018-12-27 11:24:34 -06:00
Diegoisawesome
5691a67629 Up to sub_807B62C 2018-12-27 02:05:09 -06:00
DizzyEggg
b9ad5de8a0 fortmatting 2018-12-26 14:50:47 +01:00
DizzyEggg
6761a049da Fix Bldalpha args 2018-12-26 14:03:48 +01:00
DizzyEggg
7e4db39da5 Fix bldcnt gpu reg args 2018-12-26 13:43:07 +01:00
DizzyEggg
7f6f6c33ab Fix BgAttributes 2018-12-26 13:05:02 +01:00
Diegoisawesome
720007e457
Merge pull request #3 from DizzyEggg/patch-1
Match nonmatching except the loop one
2018-12-25 15:04:12 -06:00
Diegoisawesome
d8948a5cda Merge remote-tracking branch 'pret/master' into trade 2018-12-25 15:03:13 -06:00
melthelesbian
2dd706ca54 use max mon moves constant where able (#480)
* use max mon moves constant where able

* fix errors in script commands file

* fix more errors
2018-12-25 11:50:15 -06:00
Marcus Huderle
dcbc8db6a3 Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c) 2018-12-25 11:46:35 -06:00
DizzyEggg
1b28844b12
Match nonmatching except the loop one 2018-12-25 15:14:15 +01:00
Diegoisawesome
dea41e1a7e trade.c up to sub_807A7E0 2018-12-24 20:18:06 -06:00
DizzyEggg
8833004d41 space 2018-12-24 23:29:47 +01:00
DizzyEggg
44e5e82f67 clean up party menu 2018-12-24 23:27:20 +01:00
DizzyEggg
43c88440e0 make it compile for reals 2018-12-24 22:28:33 +01:00
DizzyEggg
49517aca9e make it compie hopefully 2018-12-24 22:19:40 +01:00
DizzyEggg
e230afd543 Merge branch 'master' into learn 2018-12-24 22:01:52 +01:00
DizzyEggg
442b1826a2 asm party and fldeff clean-up 2018-12-24 21:59:05 +01:00
Diegoisawesome
2bca45bcf5 More link stuff, stumped on sub_807A728 2018-12-24 14:39:05 -06:00
Melody
370b1093cd fix feebas check 2018-12-24 13:48:31 -06:00
Marcus Huderle
c2fdbb0ef7 Decompile psychic.c 2018-12-24 10:52:56 -06:00
Marcus Huderle
f1213ebb4b Decompile dark.c 2018-12-24 09:55:00 -06:00
Diegoisawesome
3f08e0c76c Some more trade nonsense 2018-12-24 03:03:02 -06:00
Diegoisawesome
980b055bf0
Merge pull request #471 from DizzyEggg/clean
Get rid of externs and add includes
2018-12-24 01:33:57 -06:00
DizzyEggg
72aa9eb5a9 clear headers more 2018-12-24 00:20:38 +01:00
DizzyEggg
9320fe8f85 Clear includes 2018-12-24 00:02:29 +01:00
Rangi
78bab9ca0c Fix OLD_UNOWN_BASE_STATS formatting: tabs->spaces, and comma outside the macro 2018-12-23 17:24:10 -05:00
Diegoisawesome
e874267edb
Merge pull request #469 from DizzyEggg/data
Move some data to C
2018-12-23 10:45:19 -06:00
Diegoisawesome
f1ee374e93
Merge pull request #468 from KDSKardabox/resolve_ice_electric_split
Move 2 incorrectly split functions of electric from ice
2018-12-23 10:42:01 -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
KDSKardabox
436122ec93 Add new line at EOL 2018-12-23 13:07:00 +05:30
Diegoisawesome
a5c09bfec6 S'more trade 2018-12-23 01:26:38 -06:00
KDSKardabox
b394ad7781 Add space 2018-12-23 11:55:01 +05:30
DizzyEggg
adb4927504 Merge with master 2018-12-22 23:30:41 +01:00
Diegoisawesome
ebbe826133
Merge pull request #437 from DizzyEggg/storage
Pokemon Storage System
2018-12-22 16:12:27 -06:00
DizzyEggg
c805bab483 Storage - review changes 2018-12-22 23:00:22 +01:00
KDSKardabox
67beec5cbe Move 2 functions of electric from ice 2018-12-23 00:34:00 +05:30
DizzyEggg
6dffa6d17c Match and clean up fldeff misc 2018-12-22 19:33:45 +01:00
DizzyEggg
8fcb3f71c7 Match electric c 2018-12-22 18:52:05 +01:00
DizzyEggg
72532c9eee Match and clean up party_menu.c 2018-12-22 17:32:21 +01:00
Diegoisawesome
a39783a637 More trade.c 2018-12-22 01:26:53 -06:00
DizzyEggg
1374c11a1c Review pokemon storage system chaanges 2018-12-21 22:35:01 +01:00
Diegoisawesome
052d458f48 sub_80796B4 is a pain 2018-12-21 12:20:28 -06:00
Diegoisawesome
87fd6b8dc2
Merge pull request #463 from ShinyDragonHunter/old_unown_macro
Use a macro for OLD_UNOWN base stats
2018-12-21 12:15:34 -06:00
ShinyDragonHunter
c120a446ad Moved macro to the top of base_stats.h 2018-12-21 10:37:35 +00: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
golem galvanize
64832ff67e start ice 2018-12-20 16:20:34 -05:00
DizzyEggg
7dcb614cca PSS is done 2018-12-20 22:14:36 +01:00
ShinyDragonHunter
c489bb88b7 Updated macro name to be less vague 2018-12-20 13:59:00 +00:00
ShinyDragonHunter
51e5be68de Use a macro for OLD_UNOWN base stats 2018-12-20 11:28:19 +00:00
Diegoisawesome
6ef9671718
Merge pull request #440 from garakmon/fldeff
Decompile / port fldeff_80F9BCC
2018-12-19 22:16:59 -06:00
Diegoisawesome
c74bfbe110
Merge pull request #462 from Deokishisu/Move-data-out-of-wild_encounter.c
Move data out of wild_encounter.c
2018-12-19 22:11:57 -06:00
Deokishisu
a3543c9a34 Move data out of wild_encounter.c
wild_encounter.c is cleaned up, and its data has been moved to src/data/wild_encounters.h.
2018-12-19 22:50:54 -05:00
garak
5eac3ce1a2 rename fldeff_misc 2018-12-19 22:19:54 -05:00
Marcus Huderle
b7ce383a96 Document a bunch of battle anims 2018-12-19 21:19:44 -06:00
garak
af208a6bbb Merge branch 'fldeff' of https://github.com/garakmon/pokeemerald into fldeff 2018-12-19 21:35:32 -05:00
Diegoisawesome
48d7c0a7a3
Merge pull request #454 from golemgalvanize/decompile_party_menu
Decompile party menu
2018-12-19 19:57:31 -06:00
garak
f801eed3a8
clean fldeff file 2018-12-19 20:52:41 -05:00
golem galvanize
d6589d1abc another fix 2018-12-19 20:50:36 -05:00
golem galvanize
44fae5a688 add TM constant use 2018-12-19 20:44:40 -05:00
golem galvanize
64d4eed63b hidden conversation fixes applied 2018-12-19 20:27:44 -05:00
Diegoisawesome
5b73fe138c
Merge pull request #457 from golemgalvanize/decompile_water
Decompile water
2018-12-19 19:16:40 -06:00
golem galvanize
038836d21d pretty sure it's fixed now 2018-12-19 20:08:01 -05:00
golem galvanize
085e793460 one line cleanup in summary_screen 2018-12-19 19:55:51 -05:00
golem galvanize
fabbbdd02a fix up party_menu 2018-12-19 19:53:52 -05:00
golem galvanize
6f0dd694ea removed weird comment 2018-12-19 19:48:28 -05:00
DizzyEggg
128239d65e Almost there 2018-12-19 22:47:27 +01:00
Melody
5e6ceeb631 update applymovement to remove magic numbers 2018-12-19 14:08:01 -05:00
golem galvanize
e771854eae removed commented out attempt 2018-12-19 10:51:55 -05:00
golem galvanize
0fa120ebcd get a nonmatching slightly more functional 2018-12-19 10:48:15 -05:00
golem galvanize
cd785011fe decompiled water 2018-12-19 10:31:37 -05:00
Diegoisawesome
bd7c251859 Fix compressed palette alignment 2018-12-18 20:15:59 -06:00
Diegoisawesome
2592803460 Merge branch 'master' of github.com:pret/pokeemerald into trade 2018-12-18 19:54:27 -06:00
Diegoisawesome
cd994f4935 Begin trade.c 2018-12-18 19:29:41 -06:00
golem galvanize
f7df299be8 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_water 2018-12-18 20:23:32 -05:00
golem galvanize
15a7b1bc08 begin water.s 2018-12-18 20:23:07 -05:00
Marcus Huderle
b2ac3b6d6f Decompile most of battle_anim_effects_3.c 2018-12-18 19:15:59 -06:00
Marcus Huderle
d2b5a0e83f Convert battle_anim_815A0D4 data to .c 2018-12-18 19:15:59 -06:00
Diegoisawesome
2c7948bae8
Merge pull request #452 from Meowsy/pokemon-adding-easer
Add macros to simplify defining front animations and still pics.
2018-12-18 14:27:01 -06:00
Meowsy
d6b31346c3 Additional SPECIES_* documentation. 2018-12-18 10:03:57 -05:00
Meowsy
9ca27f1332 Document return value. 2018-12-18 09:20:43 -05:00
golem galvanize
8781d969ff finish party_menu 2018-12-18 05:38:08 -05:00
golem galvanize
c259ee46d3 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-18 05:31:39 -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
Meowsy
e92245ab06 Add macros to simplify defining front animations and still pics. 2018-12-17 12:29:35 -05:00
Meowsy
62c4379a21 Remove magic numbers. 2018-12-17 12:28:11 -05:00
golem galvanize
076d07f6fe Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-17 02:40:30 -05:00
golem galvanize
71a7a8a075 decompiled up to sub_81B8A7C 2018-12-17 02:39:17 -05:00
shinny456
60484153a5 decompile electric.s 2018-12-16 22:23:05 -05: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
Marcus Huderle
d1e6e705cc Decompile battle_anim_effects_1.c 2018-12-16 11:39:22 -06:00
Marcus Huderle
9c5fa4a787 Fix typo in UpdateContestPaintingMosaicEffect() 2018-12-16 08:28:09 -06:00
Marcus Huderle
fb9a365dc6
Merge pull request #448 from Meowsy/pokedex-documentation
Pokedex Documentation
2018-12-15 18:06:42 -06:00
Meowsy
1d09216e4b Simplify comparisons. 2018-12-15 18:39:48 -05:00
Meowsy
6ed8e4d6ed Rename temp_notNationalDex to temp_isHoennDex.
Don't use hexadecimal format for x and y args.
2018-12-15 18:34:06 -05:00
Meowsy
3d8cecb662 Use correct term. 2018-12-15 18:32:50 -05:00
DizzyEggg
f1421d94c3 Up to sub 0x80ce580 2018-12-15 23:58:47 +01:00
Meowsy
83c3f13655 Prettify line. 2018-12-15 15:26:07 -05:00
Meowsy
8f168add21 Remove incorrect comment. 2018-12-15 15:25:45 -05:00
Meowsy
bc11a4a9f4 Document various things relating to the Pokedex. 2018-12-15 15:12:28 -05:00
Marcus Huderle
1ca3656d74
Decompile contest_painting.c (#447) 2018-12-15 13:07:07 -06:00
Slawter666
2fa0555ed5 Document some of item_menu.c 2018-12-15 18:08:13 +00:00
garak
7e170a06cc label some sprite templates 2018-12-14 19:39:01 -05: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
golem galvanize
6748ef72fb Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-12-13 00:31:06 -05:00
Marcus Huderle
170b6ef449
Decompile battle_intro.c (#444) 2018-12-12 23:18:25 -06:00
golem galvanize
2265d49ac2 decompiled up to sub_81B5A8C 2018-12-12 22:55:39 -05:00
DizzyEggg
59a69eb627 Storage up to icon palettes 2018-12-12 23:19:50 +01:00
DizzyEggg
74746603ad More pokemon storage 2018-12-11 23:09:12 +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
Meowsy
68017b531a Rename UnknownPokemonStruct to BattleTowerPokemon. 2018-12-10 15:49:33 -05:00
DizzyEggg
c2d8876174 Document PSS functions 2018-12-10 21:36:52 +01:00
Diegoisawesome
58ca87accc
Merge pull request #441 from Meowsy/document-pockets
Document bag pocket magic numbers.
2018-12-10 11:23:41 -06:00
Diegoisawesome
bfdfe367e8
Merge pull request #422 from garakmon/frontier_data_1
Battle tower data
2018-12-10 11:22:16 -06:00
Meowsy
2f008e866b Document return locations. 2018-12-10 11:39:57 -05:00
Meowsy
0aa41ad647 Fix whitespace to be consistent. 2018-12-10 11:38:27 -05:00
garak
c8cad8a389 re-add explicit array sizes 2018-12-10 10:33:51 -05:00
garak
2187dbb10a remove explicit array lengths from battle_tower.c 2018-12-10 10:17:03 -05:00
garak
10237e8d13 move externs and remove comments 2018-12-10 09:52:36 -05:00
Meowsy
e143804af0 Document pocket magic numbers. 2018-12-10 04:33:29 -05:00
golem galvanize
a6db7b2419 decompiled up to brm_cancel_1 2018-12-10 02:38:23 -05:00
garak
62384e7a61 use facility class constants 2018-12-09 22:57:46 -05: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
DizzyEggg
431e7e7e5c More storage work 2018-12-09 21:06:43 +01: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
Marcus Huderle
342d23e0ba
Merge pull request #436 from KDSKardabox/master
Decompile ghost
2018-12-09 07:59:32 -06:00
KDSKardabox
4233ae50c3 Finish decompile ghost 2018-12-09 18:38:15 +05:30
DizzyEggg
c46499b05c field screen review changes 2018-12-09 12:16:01 +01:00
DizzyEggg
4683cdc30c Merge branch 'master' into weather 2018-12-09 11:56:50 +01:00
KDSKardabox
8712757d24 Merge remote-tracking branch 'upstream/master' 2018-12-09 13:44:41 +05:30
KDSKardabox
f8838491f6 Initial commit for ghost 2018-12-09 13:44:07 +05:30
Diegoisawesome
0b91d2948a
Merge pull request #429 from nullableVoidPtr/master
Various fixes and cleanups
2018-12-08 21:44:12 -06:00
nullableVoidPtr
cceb8ac331 Remove trailing whitespace 2018-12-09 11:32:58 +08:00
DizzyEggg
4d2f1bad7f fix header 2018-12-08 22:12:44 +01:00
DizzyEggg
b94ae8bb92 Merge branch 'master' into weather 2018-12-08 22:10:20 +01:00
DizzyEggg
4ec14b3d43 Finish field screen 2018-12-08 22:05:11 +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
Marcus Huderle
88ffb09765
Merge pull request #432 from KDSKardabox/master
De-compile fire
2018-12-08 12:41:08 -06:00
KDSKardabox
1357449d73 Merge remote-tracking branch 'upstream/master' 2018-12-09 00:01:45 +05:30
KDSKardabox
2dfbe75b05 Shift externs to header file 2018-12-08 23:52:52 +05:30
DizzyEggg
4c23adb5f5 Decompile field weather 2018-12-08 19:05:03 +01:00
Meowsy
6babb97182 Fix typo "ggText_DexSortSmallestDescription". (#433)
Should be "gText_DexSortSmallestDescription".
2018-12-08 11:57:19 -06:00
Marcus Huderle
f3a25f83cf
Decompile roulette_util.c (#434) 2018-12-08 11:56:59 -06:00
KDSKardabox
5630ab2b1e Fully decompile fire 2018-12-08 17:55:17 +05:30
KDSKardabox
0f82e5caf7 Intial commit for decomp fire 2018-12-08 15:15:52 +05:30
nullableVoidPtr
f50faac244 Clean more tables 2018-12-08 14:10:30 +08:00
nullableVoidPtr
8a8baaeaaa Merge remote-tracking branch 'upstream/master' 2018-12-08 12:13:15 +08:00
nullableVoidPtr
907ed3f5f5 Format pokemon.c 2018-12-08 11:39:35 +08:00
nullableVoidPtr
4d307a6f63 Clean some more arrays 2018-12-08 11:33:41 +08:00
DizzyEggg
6068495619 Document trainer battle scripts (#430) 2018-12-07 16:50:56 -06:00
golem galvanize
53fac4417b fixing merge conflicts 2018-12-07 14:47:20 -05:00
Melody
2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
nullableVoidPtr
4fc3fa9e44 Realign comments, clean tables in pokemon_animation.c and use SPECIES_OLD_UNOWN_ defines 2018-12-07 20:18:24 +08:00
golem galvanize
18124740a4 pushing so I can merge 2018-12-06 23:14:33 -05:00
Diegoisawesome
6df2042b3b
Merge pull request #427 from Slawter666/pokedex
Document some more of pokedex.c
2018-12-06 13:39:32 -06:00
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
nullableVoidPtr
3909b6408c Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
2018-12-06 09:44:08 +08:00
DizzyEggg
a9e6154fa9 Finish porting battle frontier data 2018-12-05 22:21:26 +01:00
DizzyEggg
fc806b966e Merge branch 'frontier_data_1' of https://github.com/garakmon/pokeemerald into help_garak 2018-12-05 21:24:01 +01:00
Melody
2347e36d60 document pokédex options 2018-12-05 10:10:33 -05:00
Slawter666
9cfed81789 Document some more of pokedex.c 2018-12-05 00:15:22 +00:00
garak
d9287f3261 extern gTower trainer data 2018-12-04 12:15:13 -05:00
garak
80c3258504 finish battle tower data except sRubyFacilityClassToEmerald 2018-12-04 12:09:35 -05:00
garak
e69cb6b276 update frontier class names 2018-12-03 17:21:34 -05:00
garak
2c14d6ee6c fix merge conflicts 2018-12-03 16:58:28 -05:00
DizzyEggg
bac1f1b6c9
Match and clean rotating_gate.c
One more down, many more to go.
2018-12-03 21:44:47 +01:00
DizzyEggg
c7dd347bb1
Match battle_tower.c function
For some reason, I gave the function of type void, type u16 instead, which messed up the registers, LMAO
2018-12-03 21:09:26 +01:00
DizzyEggg
ba1fc05558 tabs 2018-12-03 18:10:03 +01:00
DizzyEggg
0d122bc831 Fix merge conflicts 2018-12-03 17:56:36 +01:00
Diegoisawesome
ffa8655f4c
Merge pull request #423 from Slawter666/pokedex-doc
Document some of pokedex.c
2018-12-03 10:53:21 -06:00
DizzyEggg
e1829c40ab Clean up safari zone 2018-12-03 17:31:34 +01:00
DizzyEggg
2821eafb99 Clean up roamer 2018-12-03 17:19:10 +01:00
DizzyEggg
dcb1d78fa9 Add battle controllers var to src from sym_ewram 2018-12-03 16:20:39 +01:00
DizzyEggg
846b5d79e4 Get rid of headers in src/data 2018-12-03 16:10:41 +01:00
Slawter666
715fbb379e Document some of pokedex.c 2018-12-03 14:58:25 +00:00
DizzyEggg
a83fc52a7e Make data easier to edit 2018-12-03 14:49:16 +01:00
Melody
44af811033 index trainer front anims ptr table 2018-12-03 08:36:10 -05:00
Melody
2779421ad4 fix brendan/may/wally consistency issues 2018-12-03 08:01:52 -05:00
DizzyEggg
d8b952f94c Clean up items data 2018-12-03 13:37:32 +01: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
72bd670ba6 index trainer class lookups 2018-12-02 22:35:31 -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
DizzyEggg
9828e0e97b Merge with master 2018-12-02 19:38:05 +01:00
Diegoisawesome
ee05197eba
Merge pull request #418 from DizzyEggg/link_rfu
Finish Link rfu
2018-12-02 12:29:31 -06:00
DizzyEggg
a42bfd7a0e fix brackes n ne file 2018-12-02 19:27:56 +01:00
DizzyEggg
b87e6a4e57 Get rid of static functions in includes 2018-12-02 18:58:33 +01:00
DizzyEggg
d137ebc7a9 Some more rom 8011dc0 work 2018-12-02 13:59:55 +01:00
DizzyEggg
e17140536a finish link rfu and fix rom 8011dc0 2018-12-02 11:58:50 +01:00
Melody
b9cf4f27b5 renames the winstrate graphics names to pokefan 2018-12-02 00:47:04 -05:00
Melody
c7f52c4203 cleans up trainer name defines 2018-12-01 22:49:33 -05:00
DizzyEggg
b082f000af Start working on link rfu 2018-12-01 18:54:59 +01:00
Marcus Huderle
0e32a3adf3
Decompile normal.c (#414) 2018-11-30 17:29:55 -06:00
DizzyEggg
0ad4795e69 Match 2 field effect functions 2018-11-30 23:16:15 +01:00
Marcus Huderle
9dd7f8f214
Decompile pokedex_area_screen.c (#412) 2018-11-30 10:41:03 -06:00
DizzyEggg
f87e68379c match 2 field functions 2018-11-29 21:19:00 +01:00
Diegoisawesome
a7a317f6cc
Merge pull request #408 from DizzyEggg/pass_time
Match 3 link rfu functions
2018-11-28 16:51:53 -06:00
DizzyEggg
f54f5b3531 Match 3 link rfu functions 2018-11-28 23:08:20 +01:00
DizzyEggg
0ed2f54d61 Use MAX_SPRITES define 2018-11-28 21:08:22 +01:00
Marcus Huderle
0148e38973
Decompile pokedex_cry_screen.c (#406) 2018-11-28 10:14:32 -06:00
Marcus Huderle
9fafa63743 Finish decompiling internation_string_util.c 2018-11-27 17:21:23 -06:00
DizzyEggg
7cfe0342f0 Finish frontier data 2018-11-27 22:45:50 +01:00
garak
50f00b0827 Merge remote-tracking branch 'upstream/master' into fldeff 2018-11-27 13:31:07 -05:00
garak
2707bd9b91 clean frontier data 2018-11-27 13:27:49 -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
nullableVoidPtr
556bdd52e1 Clean up aligned variables in src/ 2018-11-27 19:37:29 +08:00
Slawter666
deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Marcus Huderle
382ff45452
Merge pull request #396 from DizzyEggg/attempt
Match some functions
2018-11-26 16:58:19 -06:00
Marcus Huderle
c233dbb220
Merge pull request #400 from DizzyEggg/util
Match sub_080F8970
2018-11-26 16:57:36 -06:00
Jefferson Steelflex
af08f3bb13
Update back_pic_coordinates.h 2018-11-26 16:55:37 -05:00
Jefferson Steelflex
8e5e4c2304
Fix labels, shifted off by one. 2018-11-26 16:51:08 -05:00
DizzyEggg
132a486169 Match 0x0F8970 2018-11-26 21:54:51 +01:00
DizzyEggg
c9b3f3e3cb Fix indentation 2018-11-26 20:19:52 +01:00
Marcus Huderle
2425a14b19 Decompile fight.c 2018-11-26 10:25:51 -06:00
Marcus Huderle
35c0fb5154 Decompile ground.c 2018-11-26 09:55:31 -06:00
Marcus Huderle
839c629d5b Decompile dragon.c 2018-11-26 09:31:03 -06:00
Marcus Huderle
9b1f2ccf5e Decompile poison.c 2018-11-26 09:13:45 -06:00
Marcus Huderle
2c2431aa4c
Decopmile bug.c (#399) 2018-11-26 09:03:50 -06:00
Marcus Huderle
5947e0d229 Decompile rock 2018-11-25 17:00:18 -06:00
Marcus Huderle
19e235867a
Merge pull request #395 from Slawter666/battle-ui-doc
Document some battle ui
2018-11-25 15:58:37 -06:00
Marcus Huderle
fb6120da5b Fixup some names 2018-11-25 15:50:54 -06:00
Marcus Huderle
256bfc3caa Decompile script_pokemon_util_80F87D8 2018-11-25 15:32:22 -06:00
DizzyEggg
8e10d7c0e5 Match some functions 2018-11-25 20:16:41 +01:00
Slawter666
3b501cb470 Document battle ui 2018-11-22 01:10:50 +00:00
DizzyEggg
a900a51a59 match DecompressGlyphTile nicer 2018-11-21 23:30:50 +01:00
DizzyEggg
d70c3a94c5 match DecompressGlyphTile nicer 2018-11-21 23:30:04 +01:00
DizzyEggg
c7ca38ccf3 Match DecompressGlyphTile 2018-11-21 21:58:35 +01:00
garak
f02cb667bb first 4 functions in fldeff 2018-11-20 09:51:54 -05:00
DizzyEggg
58a1bba059 tabs to spaces 2018-11-19 20:25:09 +01:00
DizzyEggg
f0ec68c058 add include 2018-11-19 18:14:28 +01:00
DizzyEggg
9f8bcadad5 apprentice and factory screen common symbols 2018-11-19 18:06:15 +01:00
DizzyEggg
37d49b34e0 Move vars to battle_main.c 2018-11-19 17:36:39 +01:00
DizzyEggg
5d5b4b853c Merge branch 'master' into frontier 2018-11-19 17:32:32 +01:00
DizzyEggg
8a00334102 document mossdeep gym 2018-11-19 17:31:46 +01:00
DizzyEggg
d22c2110de Decompile mossdeep hym 2018-11-19 17:16:01 +01:00
DizzyEggg
6a5b20ee8a Fix fossil specials 2018-11-19 17:15:28 +01:00
Marcus Huderle
72f0a079a9 Decompile all of battle_anim_utility_funcs 2018-11-19 09:37:25 -06:00
DizzyEggg
95d3c180cc clean up variables in files 2018-11-19 01:03:14 +01:00
DizzyEggg
f58cc47e17 USE RGB constants in hall of fame 2018-11-18 20:32:27 +01:00
DizzyEggg
27ee7d567e fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT 2018-11-18 20:19:10 +01:00
Diegoisawesome
0bbe03f170
Merge pull request #388 from DizzyEggg/clean_savve
Clean up save related files
2018-11-18 13:13:56 -06:00
DizzyEggg
682e6c8512 Use RGB constants in save files 2018-11-18 20:09:11 +01:00
DizzyEggg
1b0cfb0757 Party Size and Num Stats 2018-11-18 20:00:36 +01:00
DizzyEggg
7ce3473b0e Clean up save related files 2018-11-18 19:37:18 +01:00
DizzyEggg
4803a31b84 Fix unk5 field 2018-11-18 17:54:15 +01:00
DizzyEggg
4e37723288 Document Battle Pyramid 2018-11-18 17:52:22 +01:00
DizzyEggg
40a44a8508 more battle pytamid 2018-11-17 22:55:39 +01:00
DizzyEggg
eb66b60f38 Begin battle pyramid 2018-11-17 15:30:34 +01:00
Slawter666
4311fd8b89 Sort includes into alphabetical order 2018-11-14 00:01:50 +00:00
Slawter666
6fcf878e2f Tidy up header files 2018-11-13 22:28:46 +00: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
734403fdfa Merge branch 'master' into frontier_2 2018-11-12 15:42:44 +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
Slawter666
be33878b94 Synchronise wallclock.c 2018-11-12 14:04:32 +00:00
DizzyEggg
d5abd7b696 Document Battle Pie 2018-11-12 14:36:31 +01:00
DizzyEggg
3b3cffac44 Decompile battle pike 2018-11-12 14:07:31 +01:00
DizzyEggg
4fb463377c Start battle pike 2018-11-12 00:46:02 +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
DizzyEggg
1437755cdd Start arena 2018-11-07 22:54:42 +01:00
Diegoisawesome
65f053fd89 Thanks Egg 2018-11-07 14:48:06 -06:00
DizzyEggg
01fdb01364 Diego pls 2018-11-07 21:09:54 +01:00
Diegoisawesome
9f50ba1ce3 Fix incorrect compressed types, part 2 2018-11-07 12:35:31 -06: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
Slawter666
15117a8d09 Remove redundancy in berry.c 2018-11-06 23:15:57 +00:00
Diegoisawesome
9afe7a896e Merge remote-tracking branch 'pret/master' into render_text 2018-11-06 11:40:17 -06:00
Diegoisawesome
43a8534fce Merge remote-tracking branch 'origin/master' into render_text 2018-11-06 11:33:21 -06:00
Diegoisawesome
f8d337e491 Finish cleaning up text.c 2018-11-06 11:30:21 -06:00
Diegoisawesome
6d38431c33 Begin cleaning text.c 2018-11-06 10:44:48 -06:00
DizzyEggg
258ec3162f frontier util review changes 2018-11-05 22:13:59 +01:00
Diegoisawesome
7dd4ed7060 r5/r6 swap on sub_80E2578 2018-11-05 14:45:54 -06:00
DizzyEggg
487a6c2b2c this file is 2018-11-05 21:42:12 +01:00
DizzyEggg
6d0d69f3a5 Match Render Text 2018-11-04 23:09:10 +01:00
Slawter666
bd766b9049 Minor labelling of field effects 2018-11-03 20:20:28 +00:00
DizzyEggg
3159e958b8 Match a record mixing function 2018-11-03 18:21:33 +01:00
DizzyEggg
0bb51037d7 Finish frontier util 2018-11-01 21:31:10 +01:00
DizzyEggg
37d742cbd8 Document recorded battle 2018-11-01 15:06:50 +01:00
Diegoisawesome
645830624d Continue script_menu.c 2018-10-31 23:03:41 -05:00
DizzyEggg
7de1c4bd14 Make frontier util compile 2018-10-30 22:17:03 +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
9adbb5d871
Merge pull request #375 from garakmon/animation-test-temp
Back animation names
2018-10-30 12:00:37 -05: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
garak
3cb7a33f42 label back animations 2018-10-30 12:37:53 -04:00
Diegoisawesome
c8ef69a00d
Merge pull request #372 from garakmon/sprite-tags
Synchronize sprite tags
2018-10-30 11:26:44 -05:00
Diegoisawesome
f3af20d3cf
Merge pull request #370 from DizzyEggg/battle_tower
Decompile Battle Tower
2018-10-30 11:18:24 -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
e850517123 more battle frontier 2 2018-10-27 21:01:35 +02:00
DizzyEggg
269d7c2510 up to factory 2018-10-27 17:39:05 +02:00
DizzyEggg
826d0ea2ab Begin frontier records 2018-10-27 15:44:29 +02:00
DizzyEggg
b252bd0292 Window priority to window bg 2018-10-27 00:53:07 +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
DizzyEggg
dc273cc19d Battle tower - ewram variables 2018-10-26 23:54:41 +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
DizzyEggg
549b669f2a battle tower, match sth and dumb loop instead of goto 2018-10-24 23:14:45 +02: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
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
Diegoisawesome
32d2640dc7 Match GameClear (thanks Egg) 2018-10-21 16:24:43 -05:00
DizzyEggg
0ab27e44b1 more tower, fail 2018-10-21 20:13:12 +02:00
Diegoisawesome
8e7202ec3d Fix LZ compressed data alignment 2018-10-21 12:05:34 -05:00
Diegoisawesome
97bbb326b8 GameClear nonsense 2018-10-20 19:53:41 -05:00
golem galvanize
ba3247d5cd decompiled more, stuck on sub_81B1760 2018-10-20 20:25:28 -04: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
Slawter666
7a072d4527 Continue synchronising 2018-10-20 21:01:45 +01: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
DizzyEggg
f4e55999a5 begin porting and decomping battle tower 2018-10-20 00:33:51 +02: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
Diegoisawesome
95d8815721
Merge pull request #368 from Diegoisawesome/master
Finish porting/decompiling field_player_avatar
2018-10-19 00:08:59 -05:00
Diegoisawesome
dd3689fdbf Finish porting/decompiling field_player_avatar 2018-10-19 00:05:54 -05: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
DizzyEggg
dfee5deca8 Move Bitmap struct and clear sprite/text files 2018-10-18 21:24:37 +02:00
Diegoisawesome
b23dc9a123
Merge pull request #366 from Diegoisawesome/master
Finish shop and fldeff_escalator
2018-10-18 12:08:38 -05:00
Diegoisawesome
6206acd2d2 Finish shop and fldeff_escalator 2018-10-18 12:05:02 -05:00
golem galvanize
dded980cde fix building 2018-10-17 23:36:18 -04:00
garak
d1b7f32b0a begin event flag names, add temporary hidden item macro 2018-10-17 22:07:23 -04:00
golem galvanize
2c6d634acd Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu 2018-10-17 20:03:31 -04:00
golem galvanize
65a0c48eec decompiled some more of the file 2018-10-17 20:03:02 -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
Slawter666
b7b1d609d0 More synchronisation 2018-10-17 13:52:26 +01:00
Diegoisawesome
f67bbbdaaa
Merge pull request #364 from Diegoisawesome/master
Port/decompile field_control_avatar
2018-10-16 21:54:14 -05: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
DizzyEggg
1f358fbb07
Use constants 2018-10-16 22:34:53 +02:00
Slawter666
3aff112127 Begin synchronising with pokeruby 2018-10-16 14:55:16 +01: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
Deokishisu
94bec0b8db Fix Double Underscores
Whoops.
2018-10-14 16:14:01 -04:00
Deokishisu
d7ba8a306c Rename OW Sprites
Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed.

Renamed:
LittleBoy1 -> NinjaBoy
LittleGirl1 -> Twin
Woman2 -> PokefanF
OldMan1 -> ExpertM
OldWoman1 -> ExpertF
Man3 -> PokefanM
Woman6 -> LinkReceptionist
Man7 -> DevonEmployee
Boy4 -> RichBoy
Boy5 -> GameboyKid (Consistent with pokecrystal)
ContestOldMan -> ContestJudge

Renamed Because of Numbering Changes:
LittleBoy2 -> LittleBoy
LittleGirl2 -> LittleGirl
OldWoman2 -> OldWoman
OldMan2 -> OldMan
Man4 -> Man3
Man5 -> Man4
Man6 -> Man5
Woman3 -> Woman2
Woman4 -> Woman3
Woman5 -> Woman4
Woman7 -> Woman5
2018-10-14 15:49:55 -04:00
Deokishisu
a8afec762b Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly 2018-10-14 14:22:56 -04:00
Diegoisawesome
02049d52ee
Merge pull request #351 from DizzyEggg/apprentice
Decompile apprentice
2018-10-14 13:20:38 -05:00
Deokishisu
c89b14f5ef Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly 2018-10-14 14:19:23 -04:00
Diegoisawesome
43316ffae8
Merge pull request #356 from DizzyEggg/clean_battlestruct
Clean a couple of battlestructs' fields
2018-10-14 13:18:29 -05:00
Deokishisu
e129f4864f Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly 2018-10-14 14:16:07 -04:00
Diegoisawesome
0979ea91fb
Merge pull request #357 from DizzyEggg/move_heap
Move HEAP_SIZE to malloc and use void instead of empty argument list
2018-10-14 13:15:31 -05:00
DizzyEggg
c3113db931 Move HEAP_SIZE to malloc and use void instead of empty argument list 2018-10-14 20:00:14 +02: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
Diegoisawesome
e0bc3fd59c
Merge pull request #355 from DizzyEggg/use_eos
Use defines for text chars
2018-10-14 12:21:37 -05:00
DizzyEggg
ecdf0fd69d Clean battle structs 2018-10-14 18:37:52 +02:00
Deokishisu
2bd86dad2f Rename Boy4 to RichBoy 2018-10-14 12:26:48 -04:00
DizzyEggg
b73611bccb clean battle structs 2018-10-14 18:10:54 +02:00
DizzyEggg
cd4f65ecef Make apprentice compile 2018-10-14 17:06:47 +02: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
af7aa624cd make aprentice compile 2018-10-14 15:23:14 +02:00
DizzyEggg
84936b4260 Merge branch 'master' into apprentice 2018-10-14 15:07:16 +02:00
DizzyEggg
541043a661 Use defines for text chars 2018-10-14 15:04:25 +02:00
DizzyEggg
7a008a944a Move 'blend_palette'.c to util.c 2018-10-14 14:43:19 +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
36b8a6a9a2 More apprentice work 2018-10-13 23:23:33 +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
DizzyEggg
74b81bf229 start apprentice 2018-10-13 00:48:26 +02:00
golem galvanize
d3d725cc83 decompiled up to sub_81B0948 2018-10-11 21:23:39 -04:00
Diegoisawesome
04836db167 Start porting cable_club.c 2018-10-11 16:02: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
Marcus Huderle
807050a048
Merge pull request #348 from DizzyEggg/anim_files
Decompile/Port battle_anim_80A5C6C
2018-10-07 12:23:07 -05:00
DizzyEggg
dbb09aa445 get rid of SPRITE and TASK 2018-10-07 19:19:13 +02: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
Diegoisawesome
7a7aeed5e8
Merge pull request #347 from Deokishisu/GamV
Fill out VERSION_ enum with all possible values
2018-10-06 13:45:21 -05:00
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims
Document battle animation scripts
2018-10-06 08:20:41 -05:00
Deokishisu
9f69ea1931
Update gGameVersion to use GAME_VERSION 2018-10-06 01:57:39 -04:00
Marcus Huderle
ec0d350137 Move metatile behavior constants to include/constants and sync closer to pokeruby 2018-10-04 17:57:07 -05:00
Diegoisawesome
25033ef311 Finish tileset_anims macroization 2018-09-23 14:58:36 -05:00
Diegoisawesome
584cad6c0b
Merge pull request #339 from Kermalis/master
Rename voicegroups
2018-09-22 15:48:29 -05:00
Kermalis
e93f1182e6 Rename voicegroups 2018-09-22 16:42:34 -04:00
Diegoisawesome
58a5e4a261 Merge branch 'master' of github.com:pret/pokeemerald 2018-09-22 15:39:34 -05:00
Diegoisawesome
9e840dc5fe Merge remote-tracking branch 'Tetra/master' 2018-09-22 15:23:47 -05:00
Diegoisawesome
d50554bb8e Use macros and defines in tileset_anims 2018-09-22 15:02:49 -05: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
Tetrable
1f767e4c49 Document and make tileset_anims.c easier to use 2018-09-22 13:27:43 +01:00
Tetrable
4d9c513e3e Document and improve tileset_anims.c further 2018-09-22 12:50:24 +01:00
DizzyEggg
66fd9b2ddf Label trainer hill battle type 2018-09-20 22:00:00 +02:00
DizzyEggg
bf64333299 Give labels to healthbox gfx 2018-09-20 21:42:38 +02:00
DizzyEggg
e4b7ba0977 Document some not labeled battle things 2018-09-20 11:55:35 +02:00
Diegoisawesome
8a05bf82ec Merge branch 'master' of github.com:pret/pokeemerald 2018-09-18 10:03:57 -05:00
Diegoisawesome
899ae7a59a Add defines for tile, metatile, and palette count 2018-09-18 10:03:24 -05:00
Diegoisawesome
7f2d52d9e0
Merge pull request #332 from DizzyEggg/patch-5
Use defines for BattleAI_ChooseMoveOrAction
2018-09-17 10:11:25 -05:00
Diegoisawesome
6978a896d1
Merge pull request #331 from DizzyEggg/patch-3
Use pokeruby's formatting for move descriptions
2018-09-17 10:11:12 -05:00
DizzyEggg
5164215c91
Use defines for BattleAI_ChooseMoveOrAction 2018-09-16 17:06:35 +02:00
DizzyEggg
94bbfa7fa0
Use pokeruby's formatting for move descriptions 2018-09-16 15:58:13 +02:00
DizzyEggg
de65ddf4b6
Make it easier to edit ability text 2018-09-16 10:17:10 +02:00
Diegoisawesome
6a8f27c1ac
Merge pull request #326 from DizzyEggg/cablecarutil
Decompile cable_car_util.c
2018-09-16 01:06:33 -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
ff13cb6352 decompile cable car util which has nothing to do with actual cable car 2018-09-15 13:50:23 +02:00
DizzyEggg
2a7811456a Add anim tag sprite defines 2018-09-15 00:30:20 +02:00
Diegoisawesome
b8c9d9a980
Merge pull request #324 from Diegoisawesome/master
Document main_menu
2018-09-14 12:17:11 -05:00
Diegoisawesome
b860d583e4 Document main_menu 2018-09-14 12:15:46 -05: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
Marcus Huderle
ba125b23fd Remove transparency from event object spritesheets 2018-09-11 17:18:10 -05: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
Diegoisawesome
d9941cd1a8 Standardize sprite visibility to boolean 2018-09-10 10:25:58 -05:00
Diegoisawesome
cb053b3a15
Merge pull request #312 from DizzyEggg/decompile_frontier_2
Decompile Battle Factory
2018-09-10 10:20:41 -05:00
DizzyEggg
74cc2cf512 battle factory review changes 2018-09-10 10:18:30 +02:00
DizzyEggg
b87856b58e Battle Factory is decompiled and documented. 2018-09-10 01:01:39 +02:00
Tetrable
044ef98309 Document trainer animations, correct unused table labelling 2018-09-09 22:35:07 +01:00
DizzyEggg
cf8898071d Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into decompile_frontier_2 2018-09-09 20:31:56 +02:00
DizzyEggg
4d1df7ecbe comm 2018-09-09 20:31:51 +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
DizzyEggg
2f59df03ab Standartize AddTextPrinterParametrized functions, 2018-09-08 23:38:30 +02:00
DizzyEggg
1616c254d2 Swap_InitAllSprites done 2018-09-08 22:33:07 +02:00
Diegoisawesome
e1834c9d7b Change overworld_frame macro to use tiles 2018-09-08 03:07:44 -05:00
Diegoisawesome
eb8b0ff0f7 Merge branch 'master' of github.com:pret/pokeemerald 2018-09-08 02:43:19 -05:00
Diegoisawesome
12521fb1a8 Merge branch 'Slawter666-spritesheet' 2018-09-08 02:37:33 -05:00
Diegoisawesome
2b07588c02 Merge branch 'master' of github.com:Diegoisawesome/pokeemerald 2018-09-08 02:36:59 -05:00
Diegoisawesome
f73807ea60 Add palette tags for event objects 2018-09-07 23:52:11 -05:00
Diegoisawesome
d945a8bf2f Macroize main_menu and general cleanup 2018-09-07 19:24:33 -05:00
Slawter666
291ac2cee9 Add build rules for overworld sprite sheets 2018-09-08 00:28:32 +01:00
Diegoisawesome
cf8f73bde1
Merge pull request #314 from Slawter666/data
Convert data to C
2018-09-07 11:39:07 -05:00
Slawter666
54d5a7ad97 Format event object pic tables 2018-09-07 14:14:52 +01:00
Slawter666
9dec2bdef8 Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet 2018-09-07 11:50:23 +01:00
DizzyEggg
1283b87505 up to sub_819d064 2018-09-06 23:02:16 +02: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
0cd250a83e
Deleted accidently uploaded file 2018-09-06 00:00:29 +01:00
Slawter666
5656ceab6c Move graphics to src/data/graphics 2018-09-05 23:53:54 +01:00
Diegoisawesome
8defc345f0
Merge pull request #313 from ultima-soul/overworld_and_mapping
Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be de…
2018-09-05 16:50:25 -05:00
DizzyEggg
75384546b5 More factory decomp and documentation. 2018-09-05 23:30:15 +02:00
ultima-soul
857ac33adb Fixed a typo. 2018-09-05 17:25:44 +00:00
Diegoisawesome
41fe72b95d
Merge pull request #310 from DizzyEggg/patch-1
Update item_menu.c
2018-09-05 01:36:40 -05:00
ultima-soul
f505ba1bc7 Implemented gRegionMapSectionId_To_PopUpThemeIdMapping array to be dependent on Map Section ID enum rather than order dependent. 2018-09-05 01:13:17 +00:00
Slawter666
4c54212b1f Bring labels for overworld.c over from pokeruby 2018-09-04 23:31:37 +01:00
DizzyEggg
24b9cd721f More Battle Factory 2018-09-03 22:55:55 +02:00
Slawter666
5c66b8a7ef Label event_object_movement.c 2018-09-02 23:20:45 +01:00
DizzyEggg
0238b1c8ec More battle factory work 2018-09-02 19:41:33 +02:00
Slawter666
f74adc80c1 Format more templates 2018-09-02 17:53:52 +01:00
DizzyEggg
10eb952db5 Start battle factory 2018-09-02 18:10:36 +02:00
Slawter666
6106154801 Format WindowTemplate in battle_pyramid_bag.c 2018-09-02 16:26:23 +01:00
Slawter666
c1b3dfa15a Format templates in wallclock.c 2018-09-02 16:10:06 +01:00
Slawter666
c9db9b7a59 Format WindowTemplate in berry_blender.c 2018-09-02 15:14:23 +01:00
Slawter666
3119aae4b2 Format WindowTemplate in berry_tag_screen.c 2018-09-02 15:02:39 +01:00
Slawter666
f45c9e75db Format templates in item_menu.c 2018-09-02 14:49:29 +01:00
Slawter666
ef4695a72c Minor labelling 2018-09-02 13:47:12 +01:00
DizzyEggg
23aab35b96
Update item_menu.c
Don't use signed values for unsigned variables
2018-09-02 00:28:03 +02:00
Marcus Huderle
8ecf3b2159 Start decompiling shop.c 2018-09-01 17:15:35 -05:00
DizzyEggg
528a1e9ed0 Match CopySpriteTiles 2018-09-01 22:53:29 +02:00
DizzyEggg
e28ce3be78 Fix the strings length issue 2018-09-01 22:03:21 +02:00
DizzyEggg
5c7ca813e7 Add AI flags to trainers data 2018-09-01 21:25:19 +02:00
DizzyEggg
44ba432dad Label various battle scripts 2018-09-01 20:00:13 +02:00
DizzyEggg
38c89b9d0f Bank to battler 2018-09-01 18:36:08 +02:00
DizzyEggg
ce949ba705 document move type variables in pss 2018-09-01 18:31:53 +02:00
DizzyEggg
96f2b995dc Pyramid bag review changes 2018-08-30 21:28:03 +02:00
DizzyEggg
43b74032fa Make pyramid bag compile. 2018-08-30 20:25:57 +02:00
DizzyEggg
917b32ffbe Finish decompiling pyramid bag. 2018-08-30 20:10:57 +02:00
DizzyEggg
bc9fe72c6e Do some pyramid bag 2018-08-30 15:01:07 +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
DizzyEggg
3dea8fa265 battle tent review changes 2018-08-29 20:38:54 +02:00
Slawter666
e30c2251ce Convert more of data2b 2018-08-27 00:26:54 +01:00
DizzyEggg
d65ebcd3dd Label a dome functiion 2018-08-26 21:41:47 +02:00
DizzyEggg
ddd4733de3 rename battle pyramid to battle pyramid bag 2018-08-26 17:54:58 +02:00
Slawter666
ca07412686 Format SpriteTemplate 2018-08-26 15:45:08 +01:00
DizzyEggg
a8a2444f93 make battle dome compikle 2018-08-26 15:58:44 +02:00
DizzyEggg
df3af2d9e1 Clean up battle dome code a bit 2018-08-26 15:51:14 +02:00
DizzyEggg
71de20a159
Merge pull request #9 from Slawter666/frontier-data
Convert battle dome data to C
2018-08-26 15:28:09 +02:00
DizzyEggg
78cad0dee5 try battle tent and fail 2018-08-26 15:27:06 +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
0d8c5b613e make battle dome compile 2018-08-25 20:14:10 +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
DizzyEggg
62a645abaf Up To CopyDomeTrainerName 2018-08-25 18:46:15 +02:00
DizzyEggg
91349324c6 up to CB2_BattleDome 2018-08-25 11:55:16 +02:00
Slawter666
709b63efa9 Split files 2018-08-24 21:21:19 +01:00
Slawter666
6b145ed77c Move data from graphics.s to C 2018-08-24 04:21:07 +01:00
Diegoisawesome
96d744706d Merge branch 'master' of https://github.com/pret/pokeemerald 2018-08-23 02:42:45 -05:00
Diegoisawesome
26ef40553c Move data from include to src 2018-08-23 02:32:34 -05: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
dea1de3fed More battle dome 2018-08-21 23:36:59 +02:00
DizzyEggg
a12b69eae1 DisplayMatchInfoOnCard decompiled 2018-08-20 22:56:05 +02:00
DizzyEggg
5da12f2b21 battle dome - more work 2018-08-19 22:26:07 +02:00
DizzyEggg
4a0f7398ec Cant believe Ive matched this 2018-08-19 20:21:37 +02:00
DizzyEggg
239c56496b This is impossible 2018-08-19 17:13:05 +02:00
DizzyEggg
fb19a8fc59 battle dome cards sensibly renamed 2018-08-19 01:06:10 +02:00
DizzyEggg
e4649245ba this file is too much 2018-08-18 19:52:25 +02:00
DizzyEggg
f7fd5ce75c Match one of the hardest battle dome functions 2018-08-18 18:23:40 +02:00
DizzyEggg
63cbc8f3cc battle dome - a couple more functions 2018-08-18 00:54:18 +02:00
DizzyEggg
5dd1afd383 contest effect review changes 2018-08-16 22:55:36 +02:00
DizzyEggg
0bfe894566 Merge with master 2018-08-16 22:53:01 +02:00
DizzyEggg
7669a94f0d this function is driving me insane 2018-08-16 22:46:02 +02:00
Diegoisawesome
2b81db7ace Fix Task_Truck1 2018-08-15 19:49:17 -07:00
Diegoisawesome
13dc7a4170 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-15 16:22:54 -07:00
Diegoisawesome
f65da613cf
Merge pull request #299 from DizzyEggg/contest_ai
Decompile Contest ai
2018-08-15 16:19:18 -07:00
Diegoisawesome
e7da514382 Finish documenting and cleaning up summary_screen
Also fix remaining nonmatchings
2018-08-15 15:58:41 -07:00
DizzyEggg
e2f5e73445 More battle dome 2018-08-15 23:04:46 +02:00
Tetrable
8896b54e8f Add national/hoenn dex defines, update dex arrays 2018-08-15 20:10:28 +01:00
Diegoisawesome
ac3f4fd994 Continue documentation and cleanup of pokemon_summary_screen 2018-08-15 11:51:47 -07:00
DizzyEggg
a54fa23b5f Begin battle frontier 1 2018-08-15 15:49:50 +02:00
DizzyEggg
dc6cf391ce Make contest ai compile. 2018-08-15 12:06:23 +02:00
DizzyEggg
92c4fc6345 Contest AI clean-up 2018-08-15 11:50:18 +02:00
DizzyEggg
c806992cfc Port contest ai from pokeruby 2018-08-15 11:43:57 +02:00
Diegoisawesome
0bc975bf57 Document and cleanup pokemon_summary_screen 2018-08-15 01:44:20 -07: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
ba225f8eaa Fix fakematching in contest effect 2018-08-15 00:25:19 +02:00
DizzyEggg
0b22ad4ab5 make contest effect build 2018-08-15 00:01:43 +02:00
DizzyEggg
0c7063c5ba Make contest effect table easier to edit in the future 2018-08-14 23:50:58 +02:00
DizzyEggg
c72b55a5c4 Match the worst function ever 2018-08-14 22:28:25 +02:00
DizzyEggg
1a0e6f7aed match contest effect 2018-08-13 21:24:11 +02:00
Diegoisawesome
6dac87abfd Cleanup and document learn_move 2018-08-12 14:28:15 -07:00
DizzyEggg
0d68af7f06 copy contest effect from ruby 2018-08-12 23:20:17 +02:00
Diegoisawesome
b40957c09b Finish decompiling learn_move 2018-08-12 13:33:41 -07:00
Diegoisawesome
bd2b7beb07 Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 13:17:51 -07:00
Diegoisawesome
335f4c1e81
Merge pull request #296 from DizzyEggg/event_data
Event data
2018-08-12 13:17:36 -07:00
DizzyEggg
f1daf7442d event data review changes 2018-08-12 22:04:49 +02:00
Diegoisawesome
9a73a47ddd Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 12:55:21 -07:00
DizzyEggg
577e6e7c1f Merge branch 'patch-2' of https://github.com/DizzyEggg/pokeemerald into event_data 2018-08-12 21:55:20 +02: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
32b0e102cf
Merge pull request #287 from DizzyEggg/easy_chat
Pikalax's Easy chat
2018-08-12 12:17: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
MCboy
2ddabca996
apply some changes 2018-08-12 22:31:58 +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
DizzyEggg
e787d5b602 Contest review changes 2018-08-12 12:08:51 +02:00
DizzyEggg
1229bead2e slot machine review changes 2018-08-12 11:50:26 +02:00
DizzyEggg
3a72e6a80d Easy chat review changes 2018-08-12 11:39:09 +02:00
Diegoisawesome
a000eb4f36 Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move 2018-08-11 19:03:38 -07: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
94eef0bfa5
Merge pull request #294 from DizzyEggg/learnsets
Make learnsets easier to edit
2018-08-11 16:27:52 -07:00
Diegoisawesome
0c29447717
Merge pull request #292 from DizzyEggg/move_desc
Move move descriptions to C
2018-08-11 16:26:16 -07:00
DizzyEggg
7b9a7765e0 Make learnsets easier to edit 2018-08-12 00:42:25 +02:00
Diegoisawesome
57b3393192 Fix compile error 2018-08-11 15:42:08 -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
7f167ca9f4
Update battle_script_commands.c 2018-08-11 23:00:16 +02:00
DizzyEggg
feee4751eb
Make event data look cleaner 2018-08-11 22:54:34 +02: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
DizzyEggg
7961aa44ba start porting slot machine 2018-08-11 17:57:20 +02:00
garak
2fc3b7f171 change sUnknown_085A1E3C to sMapHealLocations 2018-08-11 10:28:13 -04:00
DizzyEggg
59d8d56868 merge easy chat with master 2018-08-11 14:14:51 +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
Slawter666
bc42c5054c Merge remaining overworld frames 2018-08-10 00:20:19 +01:00
Slawter666
877a80d3bc Merge berry tree frames 2018-08-09 23:19:45 +01:00
Diegoisawesome
bad170b0cb Continue decompiling field_specials 2018-08-08 23:53:21 -07:00
Slawter666
dea0bba64e Merge "pokemon" frames 2018-08-09 00:55:32 +01:00
Diegoisawesome
90896e38c9 Begin porting/decompiling field_specials 2018-08-08 01:37:12 -07:00
garak
45b730e474 copy heal_location changes from pokeruby 2018-08-07 23:05:48 -04:00
Slawter666
704e3c7334 Merge https://github.com/pret/pokeemerald into spritesheet 2018-08-07 22:18:30 +01:00
Slawter666
ab2cc59629 Merge remaining "people" overworld frames 2018-08-07 22:16:03 +01:00
Diegoisawesome
85ebd76cd0 Fix fanfare constant to use define 2018-08-04 18:41:53 -07:00
DizzyEggg
eb4d9f6fed Tabs to spaces 2018-08-03 00:24:10 +02:00
DizzyEggg
d6537c811b Battle code enums in case switches 2018-08-03 00:13:44 +02:00
Diegoisawesome
759bc2671c
Merge pull request #280 from DizzyEggg/decompile_part_mon_summary
Decompile a few pokemon summary screen functions
2018-08-02 08:27:05 -07:00
Slawter666
5917f7d108 Merge frontier brains, team magma and team aqua frames 2018-08-02 00:34:28 +01:00
Slawter666
52aa9cedcf Merge May frames into sprite sheets
Plus fix Brendan's surfing and watering frame order.
2018-07-29 17:29:36 +01: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
DizzyEggg
4080c6f831 Decompile a few pokemon summary screen functions 2018-07-28 23:26:19 +02:00
Slawter666
d5825230e5 Merge "brendan" frames into sprite sheets 2018-07-28 18:11:28 +01:00
MCboy
6c365fdc94
Update field_player_avatar.c 2018-07-25 17:47:04 +04:30
MCboy
3a15012085
Update field_player_avatar.c 2018-07-25 17:28:25 +04:30
MCboy
94a5f8d529
made file better ? 2018-07-25 17:18:49 +04:30
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
82d88479ce
decompiled a bunch of functions
i also made TryInterruptEventObjectSpecialAnim functionally equivalent tho its still nonmatching so i need help with that
2018-07-24 16:59:52 +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
29276cc76c Move some trainer data from data2b.s to c structs. 2018-07-20 22:14:31 -05:00
MCboy
201fb6f818
ported code over from pokeruby 2018-07-21 03:06:40 +04:30
MCboy
43fa9da52a
decompile more code
1 non matching need help
2018-07-20 03:44:20 +04:30
MCboy
416db8e751
oops 2018-07-19 21:23:45 +04:30
MCboy
a8f9adeaf5
decompile player_field_avatar 2018-07-19 21:22:35 +04:30
MCboy
e3a82bd2c5
decompile player_field_avatar.s 2018-07-19 21:18:09 +04:30
DizzyEggg
118fa3afce IS_MOVE_PHYSICAL to IS_TYPE_PHYSIAL 2018-07-16 22:00:27 +02:00
DizzyEggg
bf0178238a Battle files - review changes 2018-07-16 20:47:30 +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
Marcus Huderle
546819bc72 Use map type constants in map headers 2018-07-12 22:39:38 -05:00
Marcus Huderle
7d375972ba Sync bg_event macros with pokeruby 2018-07-11 11:12:26 -05:00
Marcus Huderle
d675b7578c Move movement type constants into include/constants/event_object_movement_constants.h 2018-07-10 18:04:41 -05:00
Slawter666
08774bdd88 Merge https://github.com/pret/pokeemerald into pokedex-doc 2018-07-08 01:23:28 +01:00
Slawter666
dd228fae5a Minor variable labelling 2018-07-08 01:20:01 +01:00
DizzyEggg
ee3d505b58 little touches for HandleTurnActionSelectionState 2018-07-07 21:14:41 +02:00
DizzyEggg
008d961b2a add party menu defines 2018-07-07 19:57:09 +02:00
DizzyEggg
1c48e58574 small fixes 2018-07-07 14:24:19 +02:00
DizzyEggg
9892298645 Merge branch 'master' into final_battle_files_touches 2018-07-07 14:11:04 +02:00
Diegoisawesome
f79ac26ce3 Rename SetLastTalkedObjectInFrontOfPlayer to CheckObjectGraphicsInFrontOfPlayer 2018-07-05 20:33:07 -07: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
e6d67c7c22 give labels to player controller functions 2018-07-01 15:45:47 +02: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
bfc64c9689 C vars sym ewram 2018-06-30 15:35:54 +02:00
DizzyEggg
97712ec931 change mapDataId to mapLayoutId 2018-06-30 14:52:13 +02:00
DizzyEggg
15fe5a031b Merge branch 'master' into decompile_battle_tent 2018-06-30 14:43:41 +02:00
DizzyEggg
cdacc27714 change for loop in fldeff_cut 2018-06-30 14:26:33 +02:00
DizzyEggg
5434db2fc6 use region map constants 2018-06-30 14:22:09 +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
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
DizzyEggg
ab36efdaf4 document bounce effect 2018-06-20 23:07:51 +02:00
DizzyEggg
94752d4207 document battle bars 2018-06-19 00:43:15 +02:00
DizzyEggg
caa36b530a label and document battle windows 2018-06-17 16:48:58 +02:00
DizzyEggg
9329ffc2bc review cut changes 2018-06-17 12:39: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
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