Commit Graph

4712 Commits

Author SHA1 Message Date
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
DizzyEggg
149b3453f6 Fix Punishment dmg 2019-11-03 19:58:04 +01:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01: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
DizzyEggg
780517fec7 Fix weather for pre gen6 2019-10-26 18:28:02 +02: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
DizzyEggg
621dd4f0bf Fix Sheer Force moves and effects happening 2019-10-21 14:48:03 +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
e736c369d6 Merge with master 2019-10-19 17:47:55 +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
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02: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
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
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
DizzyEggg
cfb49cdd0b Truant not dumb 2019-09-01 14:23:11 +02:00
GriffinR
5d30304f4e Use OTID constants for CreateMon 2019-08-30 22:13:14 -05:00
DizzyEggg
a41ecf7101 more ai stuff, baton pass perish song strats 2019-08-30 17:57:19 +02:00
DizzyEggg
7647941ec4 Fix Truant in new switch in system 2019-08-30 12:51:56 +02:00
DizzyEggg
f979987c2f Fix Intimidate and Trace on new switch in system 2019-08-30 12:25:21 +02: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
f19a51eea6 More ai tweaks 2019-08-27 18:54:01 +02:00
DizzyEggg
91b364e8d6 Ai use most powerful move smarrter 2019-08-27 18:29:34 +02:00
DizzyEggg
63355d6a3b Fix no targets issue and switching faint issu 2019-08-26 14:55:55 +02:00
DizzyEggg
cda75bca70 lol am dumb 2019-08-25 15:39:56 +02:00
DizzyEggg
c97869018d Fix Mega Indicator appearing and priority 2019-08-25 15:33:28 +02:00
DizzyEggg
e96e98a8de Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-08-25 13:10:32 +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
DizzyEggg
143cb7ad35 Updated switch mechanics 2019-08-22 15:57: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
DizzyEggg
f05375112b Erase isEgg field from battlemon, ability num to 2 bits 2019-08-21 11:56:49 +02:00
DizzyEggg
e4787bacbc merge 2019-08-19 14:50:47 +02: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
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
fabbc9ae31 Merge with master 2019-08-14 11:48:08 +02:00
DizzyEggg
08fe3b21ed
Fix modern
Fixes freeze on entering Pokemon Storage System
2019-08-12 11:43:31 +02:00
DizzyEggg
c9de753ecc Illusion 2019-08-08 13:06:55 +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
DizzyEggg
0dd9a3dd0c Fix Stealth Rock msg and target 2019-08-05 12:26:53 +02:00
DizzyEggg
9823d2bdf1 Fix mega evo indicator priority on lvl-up-box 2019-08-05 12:15:15 +02:00
DizzyEggg
2c2b807a57 Special Def boost for rock types in sandstorm 2019-08-05 11:48:50 +02:00
DizzyEggg
8542e7fb1f Blizzard 100% accuracy in hail 2019-08-05 11:39:31 +02:00
DizzyEggg
34a7b8bf76 Burn affects physical moves only 2019-08-05 11:30:25 +02:00
DizzyEggg
2863045241 Fix switch-in abilities text/pop-up 2019-08-05 11:24:49 +02: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
c219776034 Merge with master 2019-08-04 23:09:28 +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
Xhyzi
d66b9022a6 Added 46 move animations
- Magnet Bomb.
- Mirror Shot.
- Aqua Ring.
- Aqua Tail.
- Aqua Jet.
- Attack Order.
- Defend Order.
- Heal Order.
- Dragon Rush.
- Dragon Pulse.
- Discharge.
- Magnet Rise.
- Charge Beam.
- Shadow Claw.
- Shadow Force.
- Ominous Wind.
- Lava Plume.
- Magma Storm.
- Avalanche.
- Vacuum Wave.
- Force Palm.
- Lucky Chant.
- Double Hit.
- Giga Impact.
- Captivate.
- Rock Climb.
- Last Resort.
- Grass Knot.
- Wood Hammer.
- Zen Headbutt.
- Lunar Dance.
- Trick Room.
- Psycho Cut.
- Power Gem.
- Stone Edge.
- Rock Wrecker.
- Head Smash.
- Sealth Rock.
- Punishment.
- Sucker Punch.
- Nasty Plot.
- Switcheroo.
- Earth Power.
- Gunk Shot.
- Defog.

Fix Pyscho Shift

Hollow Orb graphics were not being loaded before creating the sprite

Fix Gastro Acid anim

Fix gastro acid palette asignation.

.
2019-07-13 01:02:09 +02:00
DizzyEggg
fc84033e3d Merge with master 2019-07-12 11:20:24 +02: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
DizzyEggg
3e476adf4a Stockpile gen4 effect and fixed spit up 2019-07-09 19:06:12 +02:00
DizzyEggg
d3d9051c4a Allow evolution after exp from mon catching 2019-07-08 13:26:21 +02:00
PikalaxALT
7fd327d632 Stack-free IWRAM clear 2019-07-07 21:41:11 -04:00
DizzyEggg
d1fa9c24cc Fix Wory Seed string 2019-07-07 09:58:36 +02:00
DizzyEggg
ed28b46cc5 Merge branch 'master' into battle_engine_v2 2019-07-07 09:49:21 +02:00
DizzyEggg
385fc49ef3
Merge pull request #163 from SBird1337/feature/animpack2
Some animations
2019-07-07 09:49:09 +02:00
Karathan
bcffc2655e fix style issues 2019-07-06 05:25:56 +02:00
Karathan
d9b54c3c1c add power swap, guard swap, worry seed 2019-07-06 05:22:18 +02:00
Karathan
8126662cfb update wring out with trace, remove AGBPrintf 2019-07-03 14:10:29 +02:00
Karathan
e9884154a9 added acupressure and wring out 2019-07-03 03:45:11 +02:00
PikalaxALT
8d224bf941 Merge branch 'master' into modern_gcc 2019-07-02 13:47:34 -04:00
Karathan
f1c82abc7e fix change requests 2019-07-02 18:34:53 +02:00
Karathan
501ae27390 add trump card, fix a few issues with pluck 2019-07-02 18:26:59 +02: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
Karathan
5f7b5ba453 add feint and pluck animation sprites and implementations 2019-07-02 06:22:05 +02: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
c14cc798af Add bs cap to switching 2019-06-28 09:30:35 +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
DizzyEggg
48c801245c Fix Synchronize 2019-06-25 13:04:14 +02:00
DizzyEggg
a98c5ab78a Merge branch 'master' into battle_engine_v2 2019-06-24 12:12:56 +02: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
aade9f5f5a Cherrim 2019-06-16 09:30:05 +02:00
DizzyEggg
c80861d85e Add hopefully support for Cherrim 2019-06-15 14:46:35 +02:00
DizzyEggg
aaea5398f4 Fix Castfrom ability pop-up and refactor one function 2019-06-14 12:58:29 +02:00
DizzyEggg
594b363730 Fix Assurance 2019-06-12 13:57:14 +02:00
DizzyEggg
dd5c9c790d Fix Flash Fire string 2019-06-11 10:57:02 +02:00
DizzyEggg
272fa07799 AI switch mons if all moves are not usable 2019-06-11 10:45:12 +02:00
DizzyEggg
30bd85a58a Fix changed name 2019-06-10 11:32:23 +02:00
DizzyEggg
9e175c9f1b Merge branch 'master' into battle_engine_v2 2019-06-10 11:21:16 +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
DizzyEggg
ad63540522 Fix mega evo issues 2019-05-24 11:27:02 +02:00
DizzyEggg
65be7868ec Fix string 2019-05-23 12:38:41 +02:00
DizzyEggg
76c5287629 Bug Bite 2019-05-23 12:32:14 +02:00
DizzyEggg
32aeba21e0 Some AI tweaking 2019-05-23 11:41:35 +02:00
DizzyEggg
1b7493e47a Fix Flame Burst crashing the game 2019-05-23 10:02:04 +02:00
DizzyEggg
01ee73adf6 Fix Flame Body Static ability pop-up activation 2019-05-23 09:47:21 +02:00
DizzyEggg
28227dfd88 Fix Life Orb string 2019-05-23 09:20:02 +02: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
DizzyEggg
8e904ebacb helping hand ai 2019-05-20 14:36:46 +02:00
DizzyEggg
e00890a555 Fix Air Baloon msg 2019-05-20 12:20:49 +02:00
DizzyEggg
e1ea4b62e9 Natural Gift 2019-05-20 12:03:00 +02:00
DizzyEggg
269f573297 Fix powder and resist berry string 2019-05-20 10:10:00 +02:00
DizzyEggg
e9829c16c4 Correct effect for seed flare 2019-05-20 09:18:49 +02:00
DizzyEggg
7ec9123b0a Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-05-20 09:16:13 +02:00
DizzyEggg
a70dceefb2
Merge pull request #154 from LOuroboros/patch-1
FLAG_SNATCH_AFFECTED for Healing Wish and Lunar Dance
2019-05-20 09:15:58 +02:00
DizzyEggg
88bbdc494b Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-05-20 09:14:32 +02:00
DizzyEggg
09c0a195ac Merge branch 'master' into battle_engine_v2 2019-05-20 09:05:12 +02:00
LOuroboros
a14016240a
Razor Leaf is a Physical move, not a Special one. 2019-05-20 03:34:13 -03:00
LOuroboros
f81daeab45
FLAG_SNATCH_AFFECTED for Healing Wish and Lunar Dance
Title is self-explanatory. As of Gen. 5, Healing Wish and Lunar Dance are affected by Snatch.
2019-05-19 23:32:59 -03:00
Flametix
dbdb827e54 Fix typos (#713)
* fix typos
2019-05-18 21:56:19 -05:00
DizzyEggg
ab421f1089 Use array count for trainer parties 2019-05-17 07:33:22 -05:00
DizzyEggg
a9b4d0208b Move new species to battle_config.h 2019-05-17 10:38:48 +02:00
DizzyEggg
f22f7866ac Merge with master, fix conficts 2019-05-17 09:52:20 +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
DizzyEggg
6624306024 Ring Target 2019-05-16 10:40:44 +02: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
94045ace0b Merge branch 'master' into battle_engine_v2 2019-05-15 13:31:53 +02:00
PikalaxALT
539d472796 Merge branch 'master' into dodrio_berry_picking 2019-05-11 21:22:09 -04:00
DizzyEggg
824a95fe07 Incinerate 2019-05-10 15:12:33 +02:00
DizzyEggg
d027bb0d7a Life Flame toxic orbs 2019-05-10 11:03:33 +02:00
DizzyEggg
875b413a09 Various battle target items 2019-05-09 20:31:58 +02:00
Marcus Huderle
0babaa8c07 Convert wild encounter data to JSON 2019-05-08 17:06:39 -05:00
DizzyEggg
bb8e397e5b Gems and dmg reducing berries 2019-05-07 15:26:58 +02:00
DizzyEggg
5bc63ab550 Merge branch 'master' into battle_engine_v2 2019-05-07 10:23:14 +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
DizzyEggg
c0470c3932 Remove skarmory mega evo 2019-05-03 17:31:23 +02:00
DizzyEggg
900c15c20c Mega evo animation 2019-05-03 17:27:49 +02:00
PikalaxALT
f13e1c78b2 through sub_81CA0EC 2019-05-02 17:53:00 -04:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02: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
PikalaxALT
9b40cdaeb9 through sub_81C99FC 2019-05-02 14:27:59 -04:00
DizzyEggg
a7f2fa67ef
Merge pull request #142 from thechurchofcage/beta
Magnetic Flux + Gear Up
2019-05-01 11:11:46 +02:00
DizzyEggg
bbe3a28b78 Merge with master 2019-05-01 11:10:41 +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
Papa Cancer
3cde800bd0 Magnetic Flux + Gear Up
Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities.
Magnetic Flux uses Charge animation.
2019-04-20 20:17:56 +01:00
Papa Cancer
b50007e861 Instruct
Re-PR'd due to excess "merges"
2019-04-20 20:11:49 +01:00
Papa Cancer
7e99272482 Laser Focus
Re-PR'd due to excess "merges"
2019-04-20 20:02:52 +01:00
Papa Cancer
c4acc3dbf8
Merge branch 'battle_engine_v2' into beta 2019-04-20 16:49:57 +01:00
DizzyEggg
5b43a9289d
Merge pull request #134 from thechurchofcage/epsilon
Baneful Bunker + King's Shield
2019-04-20 08:42:35 +02:00
Papa Cancer
e310d0f10e Core Enforcer
New code - uses Gastro Acid script instead through own move effect
2019-04-18 12:10:18 +01:00
Papa Cancer
754befe393 Baneful Bunker + King's Shield
Both apply a move effect from atk49. King's Shield swaps attacker and defender for the sake of Defiant etc. and then swaps them back!
2019-04-17 14:54:21 +01:00
Papa Cancer
e5e45bbcf5 Throat Chop
Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.
2019-04-17 13:52:25 +01: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
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
AJ Fontaine
390a68d4a7
Use Dance Flag 2019-04-13 21:13:04 -04: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
31222ef64b Add held effect debug override 2019-04-13 14:56:26 +02:00
DizzyEggg
93e86e6a76 Tweak Stomping Tantrum 2019-04-13 14:36:08 +02:00
DizzyEggg
549a9cdcc2
Merge pull request #118 from thechurchofcage/beta
Stomping Tantrum
2019-04-13 14:09:15 +02:00
DizzyEggg
4e5c543327 Remove new items data from battle engine 2019-04-13 14:02:04 +02:00
DizzyEggg
2646f3b26a Merge with master 2019-04-13 13:42:44 +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
DizzyEggg
91aafa2ebc Heal Block anim with volume change task 2019-04-09 12:49:50 +02: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
DizzyEggg
1c73e61a2b Parabolic Charge anim 2019-04-08 16:48:04 +02:00
DizzyEggg
cf73a3ba28
Merge pull request #126 from thechurchofcage/zeta
Ability-ignoring moves
2019-04-08 15:21:08 +02:00
DizzyEggg
27d645ad8a
Merge pull request #123 from thechurchofcage/delta
Leaf Storm animation
2019-04-08 15:20:09 +02:00
DizzyEggg
0e02c28927 Merge with master 2019-04-08 09:37:41 +02: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
Papa Cancer
fc8e59403a Ability-ignoring moves
Just Moongeist Meme and Sunsteel Strike for now. Added a special flag and modified "GetBattlerAbility" to check the current move for it.
2019-04-07 13:03:40 +01: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
Papa Cancer
255ac6b54d Leaf Storm animation
All credit to Doesnt, just stole it from his pokeruby build
2019-04-06 22:02:22 +01: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
DizzyEggg
f8713f9c15 Merge with master 2019-04-06 20:43:13 +02: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
Papa Cancer
33d484a7ed
Merge branch 'battle_engine_v2' into beta 2019-04-06 00:38:56 +01:00
Papa Cancer
43525d2a9c
Merge branch 'battle_engine_v2' into delta 2019-04-05 23:13:41 +01:00
DizzyEggg
a83255d103 fix after prs 2019-04-06 00:03:03 +02:00
DizzyEggg
794c9aa255
Merge pull request #121 from thechurchofcage/epsilon
Three pointless moves
2019-04-05 23:47:54 +02:00
DizzyEggg
ef9a339fde
Merge pull request #122 from Fontbane/decap
Decap Ability Names
2019-04-05 23:41:12 +02:00
DizzyEggg
7c8f69e6e3
Merge pull request #109 from Fontbane/patch-4
Field Effects for Gen IV Abilities
2019-04-05 23:40:30 +02:00
Marcus Huderle
033580da96 Document secret base 2019-04-05 16:24:57 -05:00
Fontbane
2743b069da Decap Ability Names
Also fixed names that are too long
2019-04-05 14:16:39 -04:00
Papa Cancer
4c8bc9d526 Three pointless moves
Celebrate, Hold Hands and Happy Hour. Yay(!)
Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money.
Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-05 18:10:02 +01:00
Fontbane
9ee2e1c99a Fix honey tab 2019-04-05 12:03:09 -04:00
Fontbane
e8dd8f93d1 Remove Honey functionality 2019-04-05 10:33:19 -04:00
Fontbane
7bc3cdf527 Delete level variable 2019-04-05 10:16:41 -04: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
DizzyEggg
183b714ff1 Merge with master and fix web moves 2019-04-05 12:43:44 +02: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
DizzyEggg
79fec8a38d Energy Ball animation 2019-04-02 13:05:20 +02:00
DizzyEggg
5c44f44ad2 Organize new battle anim gfx 2019-04-02 12:26:24 +02:00
DizzyEggg
cd3de7821e Merge branch 'master' into battle_engine_v2 2019-04-02 08:37:54 +02: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
Fontbane
562ad70915 Removed Gen 4 Ability field effects 2019-04-01 23:07:21 -04: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
DizzyEggg
89f766b75b Remove unneded variable 2019-04-02 00:17:15 +02:00
DizzyEggg
d39b5f6d26 Fix messing with move result flags when not needed 2019-04-02 00:14:01 +02:00
DizzyEggg
22be08f723 Revert Bubblebeam to hit only one target 2019-04-01 23:17:50 +02:00
DizzyEggg
88424b0ea3 Support for custom multi battle choose mons 2019-04-01 21:56:25 +02:00
Papa Cancer
c9ad96d228 Stomping Tantrum
Uses timer in gBattleStruct to count time since last failed move. This is augmented by a MOVE_FAILED result in atk_49 and decreased with an ENDTURN case. EFFECT_STOMPING_TANTRUM doubles  base power if the timer is set.
2019-04-01 20:06:45 +01: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
DizzyEggg
83936185be Add precautions 2019-04-01 15:08:19 +02:00
DizzyEggg
62863516c8 Fix Bubblebeam animation in double battles 2019-04-01 15:03:04 +02:00
DizzyEggg
14a34b002a Electroweb animation 2019-04-01 14:43:18 +02: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
DizzyEggg
944dc4f6bf Merge with master 2019-04-01 13:40:42 +02:00
DizzyEggg
62192b86f7 Aroma Veil 2019-04-01 11:42:37 +02: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
DizzyEggg
e878de782e
Merge pull request #114 from thechurchofcage/gamma
Misc. move updates
2019-03-31 22:08:14 +02:00
DizzyEggg
6f9096c613 Add Sweet Veil 2019-03-31 22:02:39 +02:00
DizzyEggg
b12334c88b Remove cases from ABE, add functionality of Flower Veil 2019-03-31 21:38:58 +02:00
Marcus Huderle
d13563b174 Document some faraway_island code 2019-03-31 14:09:40 -05:00
Papa Cancer
1d5cf3acb5 Misc. move updates
Bind: 75% Acc -> 85% Acc
Disable: 55% Acc. -> 100% Acc.
Freeze-Dry: 10% chance to freeze
Hammer Arm and Ice Hammer: lower user's speed
High Jump Kick: 130BP, 10 PP
Jump Kick: 100BP, 10 PP
Tail Glow: raises Sp. Atk by 3 stages
Waterfall: 20% chance to flinch
2019-03-31 18:25:37 +01:00
Marcus Huderle
462b196abc Give battle_anim files appropriate names 2019-03-31 12:15:39 -05:00
Papa Cancer
ebe2dc6bbb Mat Block
Nothing more needs to be said
2019-03-31 17:17:13 +01: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
17e74756cb Merge with master, add defines to atk49 and statbuffchange commands 2019-03-31 15:19:25 +02: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
DizzyEggg
86e8bf0ecb Cursed Body PP check 2019-03-30 11:58:19 +01:00
DizzyEggg
e2268bd938 Imposter check for semi invulnerable 2019-03-30 11:56:15 +01:00
DizzyEggg
ea0049da89 Fix Spiky Shield 2019-03-30 11:50:55 +01:00
DizzyEggg
876be1d9cd
Merge pull request #104 from thechurchofcage/beta
Spiky Shield
2019-03-30 11:21:27 +01: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
DizzyEggg
567240b725
Merge pull request #107 from thechurchofcage/gamma
Taunt fix etc.
2019-03-29 22:24:03 +01:00
DizzyEggg
e92a0816fd
Merge pull request #110 from thechurchofcage/epsilon
Minor Doubles ability fixes
2019-03-29 22:20:04 +01: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
Papa Cancer
a3b4767dd2 Spiky Shield
Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed
2019-03-26 17:45:34 +00: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
Papa Cancer
408485263d Minor ability fixes
Status moves that target both opponents will trigger a mon with Clear Body, White Smoke, Hyper Cutter etc. to prevent the loss of stats, but if its partner is targeted first, that partner gets the popup: https://drive.google.com/open?id=1dtTfgxvppD4s2ZL5scPDz9YDf4n7AhMW
This fixes that.
2019-03-26 01:34:39 +00:00
Fontbane
2cfa5ea326 Fixed Honey
And updated gitignore
2019-03-25 19:00:46 -04:00
scnorton
03e58d7dc9 through sub_80262C0 2019-03-25 18:08:25 -04:00
Fontbane
fc69631a10 Field effects for Gen IV Abilities
Also added Honey (acts like White Flute for now) and made it so the Griseous Orb can't be removed from Giratina in battle.
2019-03-25 17:49:29 -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
AJ Fontaine
cf0e38b11f
Can't Knock Griseous Orb Off Giratina
I'll do Plates Drives and Memories later
2019-03-24 22:33:54 -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
Papa Cancer
61a7bd2788 Taunt fix etc.
Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's.
Heal Block now displays the correct string when preventing usage of a move.
2019-03-24 12:54:01 +00: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
DizzyEggg
7018745230 Fix Defiant stat raise by allies 2019-03-23 17:21:14 +01:00
Marcus Huderle
fffdbe4e79 Match sub_8167420 2019-03-23 11:16:53 -05:00
DizzyEggg
d1fb5fa148 Remove unnecessary condition from Cursed Body 2019-03-23 16:59:58 +01:00
DizzyEggg
b8a634770f Touch up Weak Armor 2019-03-23 16:56:56 +01:00
Marcus Huderle
511ff2f20f Match sub_8166BEC and do some cleanup 2019-03-23 10:41:09 -05:00
DizzyEggg
b9052fb37d Touch Up Justified and Rattled 2019-03-23 16:37:56 +01:00
DizzyEggg
e135ea47e5 Touch up Anger Point 2019-03-23 16:33:08 +01: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
53c60ab292 Merge branch 'master' into battle_engine_v2 2019-03-23 15:54:08 +01: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
DizzyEggg
54ab6b43dc Merge with master 2019-03-22 10:40:31 +01:00
Marcus Huderle
768a68d3e8 Decompile ereader.c up to faraway island code 2019-03-21 18:36:12 -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
DizzyEggg
34cbb26e5e Synchronoise third type support 2019-03-08 10:30:23 +01:00
DizzyEggg
c329252ce3 Add Safety Googles effect 2019-03-08 10:16:54 +01: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
DizzyEggg
055f5a17b4
Merge pull request #103 from LOuroboros/battle_engine_v2
Protective Pads' description and Safety Goggles
2019-03-07 19:20:51 +01:00
DizzyEggg
b3ec24ab12
Merge pull request #102 from LOuroboros/battle_engine_v2
Gen. 5 Gems and Gen. 7 hold items stuff
2019-03-07 18:53:48 +01:00
LOuroboros
7d7e54c59a Added the item sprite of the Safety Goggles. 2019-03-07 13:54:54 -03:00
LOuroboros
25ff138ead Reordered the Item IDs a little bit to add the Safety Goggles and also added their item data. 2019-03-07 13:52:46 -03:00
LOuroboros
3e5d64a070 Fixed the Protective Pads' description. 2019-03-07 13:47:02 -03: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
DizzyEggg
f9ee31903d VCreate and fix stat stage changes functions 2019-03-07 12:20:57 +01:00
LOuroboros
75d78f4941 Added the item sprites of the Gen. 7 hold items. 2019-03-07 07:19:40 -03:00
LOuroboros
f3babe1e51 Partly fixed the description of the Protective Pads, fixed their price tag and also added the data for the other Gen. 7 hold items. 2019-03-07 07:13:37 -03: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
LOuroboros
ee8b72e68c Implemented the sprites for the Gen. 5 gems. 2019-03-06 15:33:02 -03:00
LOuroboros
5f58b531a2 Added item data for the Gen. 5 gems. 2019-03-06 15:29:58 -03:00
DizzyEggg
7a8f524bc5 Proper Roar handling in double battles 2019-03-06 12:09:34 +01: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
fddb5159b4 Merge with master 2019-03-05 21:46:45 +01:00
Papa Cancer
2050ac3963 Grassy Terrain v2
All corrected, simplest version
Also includes proper ending strings for all terrains
2019-03-05 19:13:25 +00: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
Papa Cancer
cfd50eb65a Grassy Terrain + minor fixes
Includes strings for all
Fixes:
・Psychic Terrain blocks priority if the TARGET is grounded, not the user
・Psychic Terrain no longer targets an opponent
・Terrains no longer boost (or nerf, for Misty) the power of certain moves if the affect mon is semi-invulnerable
・Small fix: Meteor Mash corrected to being a physical attack
2019-03-02 22:52:43 +00: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
5c3d755ac6 Effect Spore not affected by overcoat 2019-03-02 22:48:55 +01:00
DizzyEggg
5dd7ab98d1
Merge pull request #99 from LOuroboros/battle_engine_v2
Various Things
2019-03-02 22:42:50 +01:00
LOuroboros
6332023267 Oops. NOW I fixed the 2nd typo. 2019-03-02 12:59:38 -03:00
LOuroboros
5c1cf3063f Implemented the sprites for the Gen. 6 items. 2019-03-02 12:42:53 -03:00
LOuroboros
e15c745cf5 Fixed 2 typos. Loppunite>Lopunnite and Loppunny>Lopunny. 2019-03-02 12:35:11 -03:00
LOuroboros
07f9bcad10 Swapped Keystone with Mega Bracelet. 2019-03-02 12:31:43 -03: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
DizzyEggg
bf70861798 Powder moves on grass types 2019-03-02 13:08:50 +01:00
DizzyEggg
8e9296a42b Fix team messages 2019-03-02 12:31:07 +01:00
DizzyEggg
159d1089a7 Crunch lowers Defense 2019-03-02 12:17:41 +01: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
DizzyEggg
eea162d3d8 Effect Spore ability pop-up 2019-03-01 13:59:08 +01:00
DizzyEggg
fa81559793 Fix Sturdy's pop-up 2019-03-01 13:53:06 +01:00
DizzyEggg
201b68413d
Merge pull request #92 from LOuroboros/fileformat
Implemented the sprites for the Gen. 4 and 5 items.
2019-03-01 13:40:23 +01:00
DizzyEggg
bfe95bc4b9 Merge branch 'master' into battle_engine_v2 2019-03-01 13:29:50 +01: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
LOuroboros
9564de6edb Implemented the sprites for the Gen. 4 and 5 items. 2019-03-01 00:06:31 -03:00
DizzyEggg
baf95a8e7a get rid of ugly cast 2019-02-28 17:26:09 -06:00
DizzyEggg
cebada80d0 Merge with master 2019-02-28 20:56:52 +01: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
DizzyEggg
df9e6a6889 Free up two status3 flags 2019-02-25 16:17:23 +01: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
DizzyEggg
da33c38183
Merge pull request #78 from thechurchofcage/beta
Gravity fix
2019-02-24 19:38:42 +01: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
Papa Cancer
d704b9cd5b Gravity fix
Brings down Pokémon in the middle of a two-turn flying move (only Bounce and Fly at the moment); says the appropriate message for all mons brought to the ground via Gravity
2019-02-24 13:28:24 +00:00
Phlosioneer
a25f4c75bc Decompiled a weird function 2019-02-24 04:33:58 -05:00
DizzyEggg
47dce452e9 Fix missing moves mentioning typechart 2019-02-24 10:04:21 +01:00
DizzyEggg
a16a5f43a0 Fix Pursuit dbl damage on switch 2019-02-24 09:55:21 +01:00
DizzyEggg
b0f46c68b9 Fix PSS icons not disappearing when learning mvoe 2019-02-24 09:43:07 +01: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
DizzyEggg
842e379a7b Merge branch 'master' into battle_engine_v2 2019-02-23 22:50:46 +01: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
DizzyEggg
9bc55246bc AI handle Belch 2019-02-16 18:23:56 +01:00
DizzyEggg
a001faeced New AI command for using priority moves in death situatiions 2019-02-16 14:54:17 +01:00
DizzyEggg
c1f9032989 Defiant and Competitive 2019-02-16 12:54:11 +01: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
DizzyEggg
c0f47d67aa
Merge pull request #72 from PALPATlNE/battle_engine_work
Mud bomb and Shadow Sneak Animations
2019-02-15 22:50:07 +01: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
DizzyEggg
08892d19f2 Modify the stat changer, so it supports raise/lower by 12 2019-02-14 19:48:21 +01:00
DizzyEggg
94cd547e9a Change move effect to u16 2019-02-14 13:17:27 +01:00
DizzyEggg
dc39f76a95 Spectral Thief effect 2019-02-14 12:15:53 +01: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
PALPATlNE
6c717078c6 Fixed tab to 4 spaces in ground.c 2019-02-11 03:54:54 +01: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
DizzyEggg
4c535a1b03
Merge pull request #71 from thechurchofcage/partingshot
Parting Shot
2019-02-10 18:18:49 +01:00
DizzyEggg
b5d0253890 Merge with master 2019-02-10 18:17:33 +01: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
DizzyEggg
10536196f9 AI edge case with atk up 2019-02-09 16:45:02 +01:00
DizzyEggg
3d616dfffe Add Surge Abilities 2019-02-09 14:30:16 +01:00
DizzyEggg
872389b15c Fix Download raising the wrong stat 2019-02-09 13:30:45 +01:00
DizzyEggg
691544fa0b AI takes split into account, debug view ai move points 2019-02-09 13:21:32 +01: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
PALPATlNE
e7f8186ccc Mud bomb and Shadow Sneak Animations 2019-02-08 03:13:36 +01: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
DizzyEggg
6a186b5d5a Fix Sap Sipper 2019-02-07 21:33:03 +01:00
DizzyEggg
40e1dcb1d9 Fix Psycho Shift copying toxic counter 2019-02-07 21:26:42 +01:00
DizzyEggg
aa33a61e58 Merge branch 'master' into battle_engine_v2 2019-02-07 21:17:30 +01: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
Papa Cancer
62fd90caa0 Parting Shot
Effect plus animation (looks like Snarl)
2019-02-05 21:47:50 +00: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
DizzyEggg
c436cdf384 Fix Magnet Rise 2019-02-04 13:40:13 +01:00
DizzyEggg
ed030e5b62 Fix Aurora Veil description 2019-02-04 12:46:04 +01:00
DizzyEggg
a8edf08ee4 Fix Protean ability pop-up 2019-02-04 12:43:20 +01:00
Slawter666
804e955c8d Label some more functions 2019-02-04 11:38:44 +00:00
DizzyEggg
f415871369 Merge with master 2019-02-03 10:44:05 +01: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
a42bba755b Add Crafty Shield effect 2019-02-01 14:34:16 +01:00
DizzyEggg
a3460c9e45 Code Belch effect 2019-02-01 14:17:24 +01: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
DizzyEggg
7bc4a3b3f7 Merge with master 2019-01-29 22:12:53 +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
77fcb62015
Merge pull request #64 from Kurausukun/patch-1
Prevent Skarmory from Evolving via Level
2019-01-28 20:43:29 +01:00
DizzyEggg
94d2a30d44 Merge with master 2019-01-28 20:41:46 +01: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
Kurausukun
c3126df436
Prevent Skarmory from Evolving via Level 2019-01-28 00:49:26 -05: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
ceb56e2fce
Merge pull request #62 from Mother-Of-Dragons/battle_engine_v2
Decapitalize item names and add new item descriptions
2019-01-27 23:01:59 +01:00
DizzyEggg
736826e863 New feature - battle 2 vs 1 opponent 2019-01-27 20:54:34 +01:00
Avara
dd44ab8150 Decapitalize item names and add new item descriptions 2019-01-27 17:33:29 +00:00
DizzyEggg
abd518b668 Refactor GF's idiotic coding 2019-01-27 13:52:02 +01:00
DizzyEggg
88b788bfab Fix Charge Beam effect 2019-01-27 11:57:13 +01:00
DizzyEggg
6653ecf676 Fix Safari zone bug 2019-01-27 11:47:36 +01:00
DizzyEggg
897592a8d4 Merge branch 'master' into battle_engine_v2 2019-01-27 10:58:57 +01: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
fac9631235 Fix Sandstorm raining 2019-01-19 11:22:49 +01:00
DizzyEggg
f34ab49f63
Merge pull request #56 from SBird1337/feature/battle-engine-animpack1
Add some animations (see below)
2019-01-18 23:06:19 +01:00
DizzyEggg
2c3210f4d1 merge with master 2019-01-18 22:30:34 +01:00
Karathan
0f19f969c9 modify net animation for sticky web 2019-01-15 01:11:34 +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
Karathan
832c0d6333 add toxic spike animation 2019-01-12 17:02:24 +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
DizzyEggg
aecc87447a Use more damage look-up tables 2019-01-05 19:02:01 +01:00
DizzyEggg
b667c20d80 Remove unused vars in battle main.c 2019-01-05 18:52:33 +01:00
DizzyEggg
81fe0a1339 Encore lasts always 3 turns 2019-01-05 16:02:58 +01:00
DizzyEggg
78d7c29290 Move buffers to allocated reousrces, get rid of old type effectiveness table 2019-01-05 16:00:57 +01:00
DizzyEggg
4827776a3c Merge with master 2019-01-05 10:14:20 +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