ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-10 21:55:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,292 Commits 1 Branch 0 Tags 235 MiB
03c21c3b71
Commit Graph

4909 Commits

Author SHA1 Message Date
PikalaxALT
3112cf5726 swi --> svc 2020-11-06 12:34:57 -05:00
PikalaxALT
c70c44fa48 Simplify RAM reset adaptation for modern 2020-11-06 12:29:40 -05:00
GriffinR
1220f0655c Revert to original battle factory gcc 10 fix 2020-11-04 17:46:07 -05:00
GriffinR
c3080a5a2a Fix typo 2020-11-04 16:46:26 -05:00
GriffinR
70ff0d1735 Condense fix for battle factory on gcc 10 2020-11-04 16:43:59 -05:00
GriffinR
c59a818462 Fix battle factory on gcc 10 2020-11-04 15:35:22 -05:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts 
Undo PokeCodec's PRs and port changes
 2020-11-03 09:28:45 -05:00
aaaaaa123456789
ca950a8daf Solve merge conflicts from previous commit 2020-11-02 22:18:26 -03:00
aaaaaa123456789
bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
Kurausukun
6545745e59 Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts 2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227 address comments 2020-11-02 18:43:11 -05:00
ExpoSeed
c2e8f51e35
Merge pull request #145 from AsparagusEduardo/IE-Config 
Item Expansion config file.
 2020-11-02 11:31:51 -06:00
Eduardo Quezada D'Ottone
6c04aadff8 Going to bed now 2020-11-02 00:31:04 -03:00
Eduardo Quezada D'Ottone
28dc577a73 Review changes. 2020-11-02 00:24:19 -03:00
GriffinR
9e55ae22b1
Merge pull request #1242 from GriffinRichards/constants-menuinfoicons 
Use constants for menu info icon table
 2020-10-29 23:50:43 -04:00
GriffinR
be1685c87f Use constants for menu info icon table 2020-10-29 16:34:33 -04:00
aaaaaa123456789
9794b077b5
Update src/digit_obj_util.c 
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
 2020-10-26 19:14:08 -03:00
aaaaaa123456789
bcbd05e151 Fix whitespace issues 2020-10-26 15:52:44 -03:00
aaaaaa123456789
4bbc14ecdd
Remove unused variable 
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
 2020-10-26 15:51:10 -03:00
aaaaaa123456789
00db69a302 Port back improvements from later commits 2020-10-26 12:31:07 -03:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466 re-match BattleIntroOpponent1SendsOutMonAnimation 
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
 2020-10-26 05:52:00 -04:00
Kurausukun
539fd463c8 port MovementAction_StoreAndLockAnim_Step0 fix 2020-10-26 03:46:08 -04:00
Kurausukun
43701c3860 port PrintMonWeight fakematch fix 2020-10-26 00:49:57 -04:00
Kurausukun
b2b363159f port sub_80C6104 fakematch fix 2020-10-26 00:46:01 -04:00
Kurausukun
072797844a port TrendyPhraseIdOld fakematch fix 2020-10-26 00:29:55 -04:00
Kurausukun
e8fd0bd2c3 port InitPaintingMonOamData fakematch fix 2020-10-26 00:26:15 -04:00
Kurausukun
9e033fa554 port BerryCrushCommand_BeginNormalPaletteFade fix 2020-10-26 00:22:56 -04:00
Kurausukun
9ca406b15d port Cmd_forcerandomswitch fakematch fix 2020-10-26 00:17:26 -04:00
Kurausukun
af0a1cb7bf port ReceiveDaycareMailData fakematch fix 2020-10-26 00:10:30 -04:00
Kurausukun
9d067dfe0d port sub_8181C2C fakematching fix 2020-10-26 00:06:19 -04:00
Kurausukun
83846b913a port sub_806F160 fakematch fix 2020-10-26 00:01:53 -04:00
Kurausukun
4c10f3f465 port GetFrontierOpponentClass fakematch fix 2020-10-25 23:55:38 -04:00
Kurausukun
c7d624edeb re-match sub_81D5F58 2020-10-25 23:52:39 -04:00
Kurausukun
077a2c23dc port HasNoMonsToSwitch fakematch fix (from #1181) 2020-10-25 23:45:42 -04:00
Kurausukun
193e601c2c port Phase2_FrontierLogoWave_Func4 fix 2020-10-25 23:42:50 -04:00
Kurausukun
b2100cb480 port ModifyStatByNature fakematch fix (from #1179) 2020-10-25 23:23:40 -04:00
Kurausukun
9c9b626ccb re-match CheckBagHasSpace (from #1179) 2020-10-25 23:19:56 -04:00
Eduardo Quezada
4aa6442cd4 Fixed price mixed up. 2020-10-25 01:28:14 -03:00
Eduardo Quezada
9eeb574ad1 Fixed Escape Rope using bug. Thanks ExpoSeed! 2020-10-25 01:08:27 -03:00
LOuroboros
c2502b0bf5 Review corrections 2020-10-24 15:44:40 -03:00
LOuroboros
c2f278bde3 Corrections to various items 
-Fixed the Honey's sprite thanks to Blackforest
-Corrected many items' descriptions (with feedback from the bois at RHH's Discord server)
-Added missing items data
 2020-10-24 09:41:19 -03:00
LOuroboros
15345fb401 Fixed the Honey's sprite and description 2020-10-24 06:26:30 -03:00
Eduardo Quezada
14f3d69c83 Beast ball effect. 2020-10-23 23:43:07 -03:00
Eduardo Quezada
3a3ef1a369 Reworked Heavy Ball 2020-10-23 23:12:22 -03:00
Kurausukun
af04d99cd9 port fix for UpdateSaveAddresses (from #1177) 2020-10-23 22:12:09 -04:00
Kurausukun
44c2d15ca9 re-match sub_81C79BC (from #1177) 
also re-define RBG macros
 2020-10-23 22:07:30 -04:00
Kurausukun
627853a2bf re-match SetSearchRectHighlight (from #1177) 2020-10-23 21:59:15 -04:00
Kurausukun
a1d69ae264 re-match sub_81BF2B8 (from $1177) 2020-10-23 21:51:46 -04:00
Kurausukun
9b573b283c re-match CreateFrontierBrainPokemon (from #1177) 2020-10-23 21:36:38 -04:00
Kurausukun
a6cb8279f7 re-match DrawResultsTextWindow (from #1177) 2020-10-23 21:29:59 -04:00
Eduardo Quezada
e861abeff3 Initial review changes. 2020-10-23 22:19:37 -03:00
Kurausukun
36d7e8c769 re-match TryPutLinkBattleTvShowOnAir (from #1177) 2020-10-23 21:04:28 -04:00
Kurausukun
16cf49ffbe re-match GetTypeEffectivenessPoints (from #1177) 2020-10-23 20:59:27 -04:00
Kurausukun
90211248af re-match Cmd_unknown_24 (from #1140) 
changes to data structs are necessary. other things that look
unnecessary, like the order of operands, are also necessary. fuck this
function.
 2020-10-23 20:47:10 -04:00
Kurausukun
64ba8c8061 port fakematch fixes from #1155 2020-10-22 05:45:53 -04:00
Kurausukun
9c4dddf870 re-match _InitContestMonPixels (from #1153) 2020-10-22 05:37:51 -04:00
Kurausukun
0bca313b41 remove naked asm (oops) 2020-10-22 05:04:35 -04:00
Kurausukun
2945a3a845 re-match GetConnectedChildStrength 2020-10-22 05:03:16 -04:00
Thomas Winwood
2239f3aa60 Eliminate goto in ItemUseCB_Medicine 2020-10-21 20:11:40 +01:00
Kurausukun
03f46ff23a re-match battle_anim_water functions (from #1136) 2020-10-21 04:41:57 -04:00
Kurausukun
063596d87b re-match GLYPH_COPY 2020-10-21 04:26:45 -04:00
Kurausukun
5fd555016f re-match battle_anim_flying functions (from #1126) 2020-10-21 04:04:59 -04:00
Kurausukun
eee55c65f6 re-do "match function signatures" (from #1119) 
not a matching, but I don't see why we shouldn't do this
 2020-10-21 03:45:29 -04:00
Evan
f7c3b3e246 reformat oval charm description 2020-10-19 16:07:04 -06:00
Evan
d64b926469 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2020-10-19 11:22:41 -06:00
Kurausukun
c8e832980b re-match CreateWaterPulseRingBubbles 2020-10-19 06:37:00 -04:00
Kurausukun
f0efd11aa9 re-match InitObjectEventStateFromTemplate 2020-10-19 06:19:21 -04:00
Kurausukun
56c3eefd9f re-match RotateAuroraRingColors_Step 2020-10-19 06:15:35 -04:00
Kurausukun
7d5fce9a72 re-remove extra semicolons (from #1104) 2020-10-19 05:58:51 -04:00
Eduardo Quezada
12bc93dc78 Review changes 2020-10-17 17:07:54 -03:00
Eduardo Quezada
0717783651 Dream ball config. 2020-10-17 02:51:08 -03:00
Eduardo Quezada
e320e6f7ff Quick Ball config. 2020-10-17 02:44:09 -03:00
Eduardo Quezada
6f246bb0c7 Dusk Ball config 2020-10-17 02:41:02 -03:00
Eduardo Quezada
ce3b877666 Dive Ball config. 2020-10-17 02:33:15 -03:00
Eduardo Quezada
14c243b273 Timer ball config. 2020-10-17 02:08:58 -03:00
Eduardo Quezada
32a2f91ecb Repeat Ball modifier in config. 2020-10-17 02:04:39 -03:00
Eduardo Quezada
6af4425081 Nest Ball modifier in config. 2020-10-17 02:00:53 -03:00
Eduardo Quezada
6676451353 Net ball modifier in config 2020-10-17 01:52:14 -03:00
Eduardo Quezada
0dfbbde7ce Heavy Ball modifier in config. 2020-10-17 01:47:04 -03:00
Eduardo Quezada
e65f22a76c Lure Ball modifier in config. 2020-10-17 01:33:10 -03:00
Eduardo Quezada
7fbd64ec37 Moved Shiny Charm rerolls into config file 2020-10-17 01:26:51 -03:00
Eduardo Quezada
137d9801c0 Key Items configuration in file. 2020-10-17 01:25:54 -03:00
Eduardo Alvaro Quezada D'Ottone
217afe4a03
Merge pull request #11 from AsparagusEduardo/PR-BreedIncenses 
Added breeding effects for Incenses.
 2020-10-16 20:59:35 -03:00
Kurausukun
aedfe27f8d
Remove newline 2020-10-16 17:16:25 -04:00
Kurausukun
bf03f1154f formatting 2020-10-16 16:57:41 -04:00
Kurausukun
c31c2d93d7 [LEAK INFORMED] match FadeOutBody 2020-10-16 16:55:29 -04:00
LOuroboros
f00d50d7b7 Renamed the HOLD_EFFECT_EV_BOOST label 2020-10-15 05:25:07 -03:00
Eduardo Quezada
1d2f6841f2 Added breeding effects for Incenses. 2020-10-14 19:10:04 -03:00
ExpoSeed
d649bcabbc Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion 2020-10-12 12:43:55 -05:00
GriffinR
17a77c9018
Merge pull request #1229 from ghoulslash/document 
start pokenav documentation
 2020-10-11 11:59:40 -04:00
Evan
280c68b531 renamed pokenav graphics file fixes 2020-10-11 09:11:12 -06:00
Evan
f4909b4d96 align pokenav task funcs and update some pokenav menu bg gfx files 2020-10-11 08:50:58 -06:00
kageru
52ebc4252e
Document gUnknown_03006298 2020-10-11 09:54:49 +02:00
ExpoSeed
8b83d88e75 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion 2020-10-11 00:07:10 -05:00
Evan
2b2be90a52 start pokenav documentation 2020-10-10 16:17:34 -06:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
ExpoSeed
c3113b43bb Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion 2020-10-04 02:36:07 -05:00
Michael Panzlaff
187c96d6e5 rewrite MultiBootWaitCycles as naked function 
Before, when compiling MultiBootWaitCycles with O3 and MODERN=1, you
might have run into problems during optimizations when the compiler tried
to optimize the function, even if declared NOINLINE.

When rewriting this function as NAKED function, this no longer happens
as the optimizer will treat it as black box and compilation will resume.
 2020-10-02 12:27:16 +02:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
GriffinR
66bd1e6d3f Use constants for item digits 2020-09-25 11:18:52 -04:00
tustin2121
be9100fe52 Review changes 2020-09-20 13:04:20 -04:00
tustin2121
832be34898 More documenting trainer hill 
- Renamed members and added comments in the TrHillDisplay struct.
- Formatted the trainer hill data to better match the metatile layout its representing.
- Documented the function which uses this data.
 2020-09-20 01:50:54 -04:00
tustin2121
0d3646c0b9 Trainer hill location data 
Changed the trainer hill data for trainer locations, directions, and ranges from vague unusable numbers into readable data via use of preprocessor macros.
 2020-09-20 01:09:22 -04:00
Kaz
32ae13f9b6 walda_phrase.c: Proper sub_81D9C90 match GET. 2020-09-19 19:03:07 -04:00
GriffinR
0b592228c5
Merge pull request #1186 from kiliwily/DocSomeBugs 
Document some bugs
 2020-09-19 18:09:49 -04:00
Kaz
94711208a2 menu_specialized.c: Fix fakematches. 2020-09-19 17:38:54 -04:00
Kaz
847878eae9 battle_gfx_sfx_util.c: Very annoying fakematch fix. 
daycare.c: -g eliminates the need for the brace hack.
battle_transition.c: Fix Phase2_Ripple_Func2...?
 2020-09-19 17:12:25 -04:00
kiliwily
f1366dfc69 Fix typos 2020-09-19 20:46:26 +02:00
kiliwily
56848fb891 Update battle_util.c 2020-09-19 20:44:16 +02:00
MeatLoaf3
0e74de0f9e
Changed casts to volatile 
devkitArm wouldn't copy the bits properly in some instances. Casting as volatile solved the issue
 2020-09-18 13:26:36 -04:00
Kaz
1404cf3330 field_player_avatar.c: Fix TryInterruptObjectEventSpecialAnim fakematch. 2020-09-17 18:24:11 -04:00
Kaz
c724f2b809 battle_ai_script_commands.c: -g fixes the fakematch. 2020-09-16 22:01:45 -04:00
Kaz
5a70f99e16 battle_script_commands.c: Eliminate the last nonmatching (swapped expressions). 2020-09-16 21:39:44 -04:00
Kaz
171154a097 Convert to -g; will be required for eliminating fakematches. 2020-09-16 19:36:30 -04:00
ExpoSeed
227d2dce32 Make description slightly more precise 2020-09-16 12:51:14 -05:00
ExpoSeed
778e6925de Complete TMHM Learnset description 2020-09-16 12:36:11 -05:00
aaaaaa123456789
7dc95a0103 Undo PokeCodec's PRs 
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
 2020-09-13 06:30:55 -03:00
Kaz
327dd877b5 use_pokeblock: fakematch fix. 
I am beginning to suspect that we should be using the gflib DMA macros
everywhere wherever possible.
 2020-09-13 03:47:12 -04:00
Kaz
f952144922 party_menu fakematch fix 2020-09-13 03:02:41 -04:00
Kaz
449df5860d Begin documenting berry_crush 2020-09-13 00:26:01 -04:00
Kaz
d0fcb9168b Match two minor functions in battle_tent and berry_crush 2020-09-12 21:51:16 -04:00
kiliwily
9b4ded46c6 Update pokemon.c 2020-09-12 19:20:42 +02:00
kiliwily
5c3669e0cd Bug documenting 2020-09-12 18:43:20 +02:00
GriffinR
921f389e4e Fix Rusboro and Lavarige typos 2020-09-11 14:47:47 -04:00
PokeCodec
c1286c2fe2 Change according to feedback 2020-09-10 18:07:46 -04:00
PokeCodec
87769756f8 spacing 2020-09-10 10:26:55 -04:00
PokeCodec
6967b234d4 adjustments and fakematch fix 2020-09-10 10:07:16 -04:00
PokeCodec
029db24adb Make return 2020-09-10 09:32:36 -04:00
PokeCodec
eb25b951c3 InitPaintingMonOamData fix 2020-09-10 09:14:53 -04:00
PokeCodec
50a6b73edc Fix sub_80C6104 2020-09-10 09:02:04 -04:00
PokeCodec
08696108e1 Match dewford 2020-09-09 17:02:52 -04:00
PokeCodec
f50ecf5c66 Match PrintMonWeight 2020-09-09 16:35:04 -04:00
PokeCodec
7f1827767c Document size field of unknown struct 2020-09-09 16:09:31 -04:00
PokeCodec
a32f631fe6 Fix Pokemon Fakematch 2020-09-09 15:59:34 -04:00
PokeCodec
84a92279c9 Record mixing fakematch fixed! 2020-09-09 15:49:51 -04:00
PokeCodec
dc34cf1711 Mail Time 2020-09-09 15:09:40 -04:00
PokeCodec
56afdee7fc Remove register variable mention 2020-09-09 14:43:41 -04:00
PokeCodec
aa45c05a3e Match Battle Tower 2020-09-09 11:21:16 -04:00
PokeCodec
a3a8c23e00 Match battle_script commands 2020-09-09 11:18:04 -04:00
PokeCodec
3af118b0a7 Fix fakematch in pokemon animation 2020-09-09 11:12:12 -04:00
PokeCodec
779764b70d Fix Battle_Script_commands fakematch 2020-09-09 10:35:40 -04:00
PokeCodec
f980188b82 Fix battle transition fakematch 2020-09-08 20:54:41 -04:00
PokeCodec
34f54dd438 Fix Battle util fakematch 2020-09-08 20:46:08 -04:00
PokeCodec
6e3f5a462a Remove fakematch in trainer hell 2020-09-08 20:25:07 -04:00
PokeCodec
bb5da949f2 Fix build 2020-09-08 19:44:33 -04:00
PokeCodec
6bb1d58a11 Finished header includes 2020-09-08 19:17:33 -04:00
PokeCodec
e84da39d8a Match BattleIntroOpponent1SendsOutMonAnimation 2020-09-08 18:54:51 -04:00
PokeCodec
4d31980359 Undo comment 2020-09-08 16:25:09 -04:00
PokeCodec
3336eb341d More adjustments 2020-09-08 14:26:37 -04:00
DizzyEggg
271219f962 Merge with master 2020-09-08 12:00:51 +02:00
PokeCodec
5f7a410359 Preparation for matching BattleIntroOpponent1SendsOutMonAnimation 2020-09-06 20:01:16 -04:00
PokeCodec
8200682b21 u8 position 2020-09-06 19:02:30 -04:00
PokeCodec
e6684664ba Fix casting bug 2020-09-06 15:16:40 -04:00
PokeCodec
781eb38d5b Removed unused comment 2020-09-05 20:51:21 -04:00
PokeCodec
8b729cf225 While to do_while 2020-09-05 18:15:53 -04:00
PokeCodec
fe9ab67063 Change division to explicit shifts for consistency 2020-09-05 18:13:51 -04:00
PokeCodec
3ce29ee7bf Refactor Use Item 2020-09-05 17:36:10 -04:00
PokeCodec
5d694edb18 Specify array size: 12 semitones 2020-09-05 17:31:10 -04:00
PokeCodec
53a4effd57 Tidy up headers 2020-09-05 16:41:44 -04:00
PokeCodec
ac9a86d7ce Remove movementAction fakematch 2020-09-05 14:51:45 -04:00
PokeCodec
0039542e19 Match CheckBagHasSpace 2020-09-05 14:41:43 -04:00
PokeCodec
a7a64ecba0 Fixup ModifyStatByNature 2020-09-05 11:47:24 -04:00
PikalaxALT
16ecbc6446
Merge pull request #1177 from PokeCodec/MatchEmerald 
Match All but 2 remaining naked functions
 2020-09-05 10:25:10 -04:00
PokeCodec
3e25d9e5a2 Removed unused parentheses 2020-09-05 10:01:21 -04:00
Eduardo Quezada
b7fe94108c Fixed Pacifidlog typo. 2020-09-05 01:11:07 -04:00
PokeCodec
7efdcaf120 Removed excess parenthesis 2020-09-04 21:16:55 -04:00
PokeCodec
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
PokeCodec
da582d5258 Make JOY Macros match 2020-09-04 20:41:29 -04:00
PokeCodec
99448002e1 Refactor InitStateHandlers so each key in the reset combo is checked 2020-09-04 20:21:07 -04:00
PokeCodec
3d87a88067 Make battle pyramid defines into enums 2020-09-04 19:49:53 -04:00
PokeCodec
608da287c1 Create Macros and refactor 2020-09-04 19:49:53 -04:00
PokeCodec
aa841047a3 Make data argument const 2020-09-04 19:49:53 -04:00
PokeCodec
abae52a017 Fakematch resolved 2020-09-04 19:49:53 -04:00
PokeCodec
3746efb9c2 Use PokeNav macros 2020-09-04 19:49:53 -04:00
PokeCodec
ae9a60eb2a Documenting and whitespace fixing 2020-09-04 19:49:53 -04:00
PokeCodec
e8f2298498 Fix Typos and capitalization 2020-09-04 19:49:53 -04:00
PokeCodec
3a2a2b6ba9 Fix issues according to feedback 2020-09-04 19:49:53 -04:00
PokeCodec
1cdd0ac199 Make argument int 2020-09-04 19:49:53 -04:00
PokeCodec
52d0b59f5a Make s32 2020-09-04 19:49:53 -04:00
PokeCodec
fe81cc449e Fixed modern issue 2020-09-04 19:49:53 -04:00
PokeCodec
d4158e490a Match more functions 2020-09-04 19:49:53 -04:00
PokeCodec
24b607b9da Match sub_81BF2B8 2020-09-04 19:49:52 -04:00
PokeCodec
5a375b9236 Fix error 2020-09-04 19:49:52 -04:00
PokeCodec
987ef556e5 Match SetSearchRectHighlight 2020-09-04 19:49:52 -04:00
PikalaxALT
c3f6c56e19
Merge pull request #1161 from GriffinRichards/doc-wallclock 
Document wall clock data
 2020-09-04 19:48:04 -04:00
PikalaxALT
135ed6a162
Merge pull request #1163 from GriffinRichards/doc-animthrow 
Minor battle_anim_throw cleanup
 2020-09-04 19:44:33 -04:00
PikalaxALT
8324a35517
Merge pull request #1166 from ketsuban/tidying 
Tidy up naked functions
 2020-09-04 19:41:18 -04:00
GriffinR
2ed726c0b9 Fix BreakinsNews typo 2020-09-04 07:27:52 -04:00
GriffinR
1264c4615a
Merge pull request #1158 from GriffinRichards/doc-cablecar 
Document cable car
 2020-09-03 16:24:27 -04:00
GriffinR
627373c963 Fix segment typo 2020-09-03 16:17:29 -04:00
PikalaxALT
319b012172 Make agb_flash stack func buffers volatile 
Fixes observed crash with modern gcc
 2020-09-03 15:23:44 -04:00
GriffinR
adcffd3f0e WIP More factory screen doc 2020-09-03 01:19:08 -04:00
Thomas Winwood
a529bcf0b6 Tidy up naked functions 2020-09-02 14:49:04 +01:00
GriffinR
4ad147f75d
Merge pull request #1156 from GriffinRichards/doc-rayscene 
Document Rayquaza cutscene
 2020-09-01 14:46:14 -04:00
GriffinR
5fc49bfd9f
Merge pull request #1165 from GriffinRichards/fix-underwatermaps 
Give proper names to underwater maps
 2020-09-01 14:26:11 -04:00
GriffinR
7c8bc0fbe3
Merge pull request #1149 from PokeCodec/datatypes 
gflib documenting
 2020-09-01 14:25:21 -04:00
GriffinR
9d7a11d9c0 Clarify Underwater125 bug comment 2020-09-01 03:39:44 -04:00
GriffinR
f5495d1220 Give proper names to underwater maps 2020-09-01 03:03:14 -04:00
GriffinR
dd26bfe274 Fix alignment in sFanfares 2020-08-31 13:38:43 -04:00
GriffinR
bf61de01a7 Start documenting battle factory screen 2020-08-31 13:36:48 -04:00
GriffinR
5773bb8643
Merge pull request #1152 from GriffinRichards/doc-blender 
Document berry blender
 2020-08-30 15:33:17 -04:00
GriffinR
cdc19a0b07
Merge pull request #1144 from PokeCodec/libgbasyscall 
Cleanup and fix mistakes in libraries
 2020-08-30 15:27:08 -04:00
GriffinR
afb3472282 Minor battle_anim_throw cleanup 2020-08-30 15:11:44 -04:00
PokeCodec
5504ceada3 Change array count of pointer value to array count of the first element 2020-08-30 14:33:11 -04:00
hondew
5c7fa11390 Rename to battle_anim_throw 2020-08-30 14:25:40 -04:00
hondew
e46b35455d Merge branch 'master' into pokeball-doc 2020-08-30 14:14:38 -04:00
hondew
328aecc96e Document throwing pokeball 
continue

Document more

Doc more funcs

Remove workspace

Document shiny stars

Document PokeBlock

Clean up

Clean more
 2020-08-30 14:08:06 -04:00
PokeCodec
70e2b28c80
Change array_size to group types 2020-08-30 10:16:10 -04:00
GriffinR
778bdb4d30 Document wallclock data 2020-08-29 15:55:28 -04:00
pi1024e
6d153c6b91 Remove const 2020-08-29 13:19:29 -04:00
pi1024e
bdb976dc27 fixed mistakes 2020-08-29 13:18:35 -04:00
PokeCodec
bb30984be4
Update pokedex.c 2020-08-29 12:31:34 -04:00
GriffinR
a9719c92bf
Merge pull request #1160 from kiliwily/master2 
add MAX_LEVEL_UP_MOVES macro
 2020-08-28 19:18:03 -04:00
kiliwily
028502fce5 Update move_relearner.c 2020-08-29 01:09:17 +02:00
kiliwily
e4d26262e3 Update move_relearner.c 2020-08-29 01:04:42 +02:00
kiliwily
c68c2b66e8 add more macros 2020-08-29 01:02:20 +02:00
GriffinR
08a8aad65a
Merge branch 'master' into doc-cablecar 2020-08-28 16:17:48 -04:00
GriffinR
0cfc279af5
Merge branch 'master' into doc-rayscene 2020-08-28 16:17:11 -04:00
GriffinR
c830731734
Merge branch 'master' into doc-blender 2020-08-28 16:16:00 -04:00
GriffinR
09cfed64b5
Merge pull request #1146 from GriffinRichards/rename-songs 
Give songs meaningful english names
 2020-08-28 16:14:21 -04:00
GriffinR
e9b734c1ef
Merge branch 'master' into doc-blender 2020-08-28 16:07:35 -04:00
GriffinR
eb4bcc89cd
Merge pull request #1155 from PokeCodec/zero 
Fix "stupid" fakematch
 2020-08-28 15:54:15 -04:00
kiliwily
5e7b6a089c add MAX_LEVEL_UP_MOVES macro 2020-08-28 20:36:07 +02:00
PokeCodec
a04b0ff487 More formatting fixes 2020-08-28 14:35:37 -04:00
PokeCodec
1515a2ecc4 Fix To-Dos 2020-08-28 14:00:31 -04:00
Eduardo Quezada
a2fb98934e Partially document item_menu.c 2020-08-28 13:32:23 -04:00
pi1024e
5faf250708 format 2020-08-28 11:59:16 -04:00
pi1024e
4ac10eb807 Make formatting corrections 2020-08-28 11:52:48 -04:00
GriffinR
71a066f945 Document cable car 2020-08-28 03:54:04 -04:00
GriffinR
f7d82f940e
Merge pull request #1157 from ketsuban/max-evs-per-stat 
Add MAX_PER_STAT_EVS macro
 2020-08-28 00:22:31 -04:00
Thomas Winwood
58786a7ac0 Add MAX_PER_STAT_EVS macro 2020-08-28 02:25:02 +01:00
GriffinR
38d4fc9c17 Clean up rayquaza scene documentation 2020-08-27 16:04:11 -04:00
GriffinR
a220d3986f Document fifth rayquaza scene 2020-08-27 15:43:28 -04:00
GriffinR
e63297138d Document fourth rayquaza scene 2020-08-27 15:43:28 -04:00
GriffinR
c7e685edff Document third rayquaza scene 2020-08-27 15:43:28 -04:00
GriffinR
52b1251b48 Document second rayquaza scene 2020-08-27 15:43:27 -04:00
GriffinR
ba13e9ec95 Document first rayquaza scene 2020-08-27 15:43:18 -04:00
DizzyEggg
35559d6b71 Merge with master 2020-08-27 10:58:31 +02:00
PokeCodec
ab73820ce0 more fakematch fixing 2020-08-26 22:31:25 -04:00
PokeCodec
5054cff7e8 removed fakematch 2020-08-26 20:30:04 -04:00
GriffinR
95ea0e92e7 Start documenting rayquaza_scene 2020-08-25 17:49:42 -04:00
GriffinR
47e8a76f1e
Merge pull request #1153 from PokeCodec/paintingMatch 
Painting match
 2020-08-25 16:17:24 -04:00
PokeCodec
a2efccd6d5 remove outside parenthesis 2020-08-25 16:11:23 -04:00
PokeCodec
ba853d6b39 Removed unneeded parenthesis 2020-08-25 16:08:37 -04:00
PokeCodec
bf1e261177 Fix mistakes 2020-08-25 16:03:04 -04:00
PokeCodec
d40870e5f8 Match InitContestMonPixels 2020-08-25 15:44:05 -04:00
GriffinR
5dfbdca6c7 Fix alignment 2020-08-25 12:27:12 -04:00
GriffinR
9330df8b4c
Merge pull request #1151 from PokeCodec/list-menu 
Changed assignment from 136 to -120
 2020-08-25 03:08:07 -04:00
PokeCodec
b679e979b6 Pokedex 2020-08-24 22:47:28 -04:00
PokeCodec
3ae3bea28f fix bad asm 2020-08-24 21:57:34 -04:00
PokeCodec
e71c18feb6 use # 2020-08-24 18:29:14 -04:00
PokeCodec
09e97fff53 UB 2020-08-24 17:34:26 -04:00
PokeCodec
96d2066abe Changed assignment from 136 to -120 2020-08-24 17:28:55 -04:00
PokeCodec
3ddf7175bf Match sub_81D5F58 2020-08-24 17:20:18 -04:00
GriffinR
22c1bf965a Finish documenting berry blender 2020-08-24 17:06:55 -04:00
PokeCodec
95009c1c03 confetti 2020-08-24 14:51:43 -04:00
PokeCodec
86a1e89879 Documentation of unk field 2020-08-23 21:34:31 -04:00
PokeCodec
6aee7d38f3 sizeOf data type, not pointer value 2020-08-23 21:34:31 -04:00
PokeCodec
cc018fe6c9 Remove const 2020-08-23 17:22:15 -04:00
PokeCodec
a20745422b Remove unused variable remaining from ruby 2020-08-23 16:37:46 -04:00
GriffinR
0ff767a9b5 Start documenting berry blender 2020-08-22 19:39:39 -04:00
PokeCodec
cbb94035e3 Cleaned up the libraries. 2020-08-22 00:52:45 -04:00
PikalaxALT
d2c7a862c7
Merge pull request #1147 from GriffinRichards/doc-contestai 
Document contest AI
 2020-08-21 15:16:37 -04:00
GriffinR
fbb70b3727 Document contest AI scripts 2020-08-21 14:57:17 -04:00
PikalaxALT
cd895e497d
Merge pull request #1141 from GriffinRichards/add-nonmatch 
Wrap asm statements in NONMATCHING
 2020-08-21 12:44:07 -04:00
GriffinR
469ec5f248 Document contest AI commands 2020-08-21 02:36:48 -04:00
GriffinR
ee72696b53 Sync encounter musics with encounter music types 2020-08-20 21:03:24 -04:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
GriffinR
6c34effda9
Merge pull request #1138 from GriffinRichards/doc-contest 
Document contest
 2020-08-20 16:03:47 -04:00
PokeCodec
e27975afaa Match battle script commands by correcting a function and the pokemon struct 2020-08-18 22:05:01 -04:00
GriffinR
7d3b68a27b Fix Champinship typo 2020-08-18 17:51:51 -04:00
GriffinR
fa29ff98a3 Add condition mod constants 2020-08-18 11:38:50 -04:00
GriffinR
0e7f634b00 Wrap asm statements in NONMATCHING 2020-08-18 08:16:09 -04:00
PikalaxALT
3372993a63
Merge pull request #1133 from GriffinRichards/doc-pblock 
Document use_pokeblock
 2020-08-17 16:28:15 -04:00
PokeCodec
337ab9c7a2 match 2020-08-16 12:33:58 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
2749948eeb Clean up contest doc 2020-08-16 05:52:17 -04:00
GriffinR
e98e4652fd Document contest live updates 2020-08-16 05:18:09 -04:00
GriffinR
9f4525666d Document misc contest 2020-08-16 02:50:35 -04:00
GriffinR
c42c1ab8c1 Document contest appeal 2020-08-15 14:32:30 -04:00
GriffinR
25f45ffa84
Merge pull request #1125 from GriffinRichards/doc-namingscr 
Document naming screen
 2020-08-15 00:06:57 -04:00
PokeCodec
35dca16a3d matching 2020-08-13 21:20:55 -04:00
GriffinR
3779422489 Split contest funcs from script_pokemon_util 2020-08-13 17:42:12 -04:00
GriffinR
4911849723 Document link contest connection 2020-08-13 16:27:40 -04:00
PokeCodec
96ef73f881 removed stray line 2020-08-12 19:58:58 -04:00
GriffinR
ade49de329
Merge branch 'master' into doc-pblock 2020-08-12 19:49:55 -04:00
GriffinR
f6efbe38bf Clean up use_pokeblock doc, some menu_specialized 2020-08-12 18:39:15 -04:00
GriffinR
67f87ce533
Merge pull request #1126 from PokeCodec/flying 
Remove fakematches in Flying anim
 2020-08-11 23:27:27 -04:00
GriffinR
5735609629
Merge pull request #1124 from PokeCodec/smaller-array 
sp stack should be 2 elements deep, not 4
 2020-08-11 23:26:09 -04:00
GriffinR
4f615b65e6 Continue documenting use_pokeblock 2020-08-11 13:56:17 -04:00
GriffinR
cc4255d4c0 Add some charmap constant usage 2020-08-11 00:23:28 -04:00
PokeCodec
7e593d37bb 2 2020-08-10 19:26:00 -04:00
PokeCodec
35c6e85e20 cleanup 2020-08-10 19:25:37 -04:00
PokeCodec
ceac2d547c Remove fakematch 2020-08-10 19:25:37 -04:00
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette 
Document roulette
 2020-08-10 17:18:09 -04:00
GriffinR
4bf43311f0 Remove redundant parens 2020-08-10 17:09:17 -04:00
GriffinR
078c341b2b
Merge pull request #1122 from GriffinRichards/clean-battlemsg 
Add stat stage constants, clean up misc battle msg data
 2020-08-10 14:29:27 -04:00
GriffinR
e947729d65 Start documenting use_pokeblock 2020-08-10 13:48:16 -04:00
GriffinR
82e322bb96 Finish documenting naming screen 2020-08-07 20:18:09 -04:00
GriffinR
463d79c7c1 Start documenting naming screen 2020-08-07 02:00:41 -04:00
GriffinR
4aed5b078a
Merge pull request #1119 from PokeCodec/patch-2 
Match function signatures
 2020-08-04 20:46:14 -04:00
GriffinR
5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
GriffinR
f8f6575360 Rename roulette_util to palette_util 2020-08-04 19:24:36 -04:00
GriffinR
8e800e2061 Document roulette flash util 2020-08-04 19:20:55 -04:00
GriffinR
868f831167 More roulette doc 2020-08-04 14:25:13 -04:00
GriffinR
b40cee540e Continue documenting roulette 2020-08-02 14:52:05 -04:00
DizzyEggg
d072897354
Update event_object_movement.c 2020-08-02 15:37:04 +02:00
DizzyEggg
7890a16d27
Fix UB in event_object_movement.c 2020-08-02 15:04:55 +02:00
PikalaxALT
03eba6a62c
Merge pull request #1116 from GriffinRichards/doc-slotmachine 
Document slot machine
 2020-08-01 09:56:44 -04:00
PokeCodec
412f341588
Match function signatures 
To make them consistent with the declarations
 2020-07-31 20:20:00 -04:00
GriffinR
22b5b6b074 Start documenting roulette 2020-07-30 19:37:16 -04:00
pi1024e
f39de3f503 terminal newline 2020-07-29 22:47:03 -04:00
PokeCodec
b39047226b Match CreateWaterPulseRingBubbles 2020-07-29 22:44:19 -04:00
GriffinR
e06de33cbd
Merge branch 'master' into doc-overworld 2020-07-28 17:46:17 -04:00
GriffinR
5eecaf92ba
Merge branch 'master' into doc-slotmachine 2020-07-28 17:41:34 -04:00
GriffinR
1f4813bfd2 Document slot machine funcs 2020-07-28 17:38:05 -04:00
PokeCodec
93be3a08ce Match 2020-07-28 15:31:08 -04:00
GriffinR
e52ffacc25 Clean up slot machine data doc 2020-07-28 15:28:16 -04:00
PokeCodec
3b43fc12fc Merge https://github.com/pret/pokeemerald into Matching 2020-07-28 15:26:05 -04:00
PokeCodec
044d968513 Match 2020-07-28 15:23:14 -04:00
PokeCodec
7b6607d9e3 Update secret_base.c 2020-07-28 15:23:04 -04:00
PokeCodec
37957b2d15 semicolon 2020-07-28 15:23:02 -04:00
PokeCodec
c722b77558 holding back on casts 2020-07-28 15:22:15 -04:00
PokeCodec
ebcb982e16 Change signedness and add casts to avoid implicit conversion warnings 2020-07-28 15:22:15 -04:00
GriffinR
b22709ee3d More slot machine data documentation 2020-07-28 14:29:44 -04:00
PikalaxALT
70617d56e4
Merge pull request #1104 from PokeCodec/Explcit-Casting 
Reduce "Implicit conversion" warnings
 2020-07-28 11:10:00 -04:00
PokeCodec
1e8ffcb898 Merge branch 'Explcit-Casting' of https://github.com/PokeCodec/pokeemerald into Explcit-Casting 2020-07-28 10:25:33 -04:00
ExpoSeed
b401e2eb86 Fix naming style of function 2020-07-27 21:22:16 -05:00
PokeCodec
fb6f859edd semicolon 2020-07-27 19:17:34 -04:00
ExpoSeed
71dc5edf2e Document some battle_util.c 2020-07-27 17:10:42 -05:00
PokeCodec
5f6e7e2279
Update secret_base.c 2020-07-27 14:59:37 -04:00
DizzyEggg
11178a49db Fix undefined behaviour in protect animation 
gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1]

The above does NOT make it certain that i gets incremented before reading from the right side. Changed it, so the function always increments i first, then reads from pal buffer.
 2020-07-27 13:17:18 -04:00
GriffinR
1c55734e44 Document faraway island 2020-07-27 13:14:48 -04:00
PokeCodec
ddd012f3ed holding back on casts 2020-07-27 12:47:08 -04:00
DizzyEggg
11c2207839 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-27 14:54:32 +02:00
DizzyEggg
f007165c53
Fix undefined behaviour in protect animation 
gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1] 

The above does NOT make it certain that i gets incremented before reading from the right side. Changed it, so the function always increments i first, then reads from pal buffer.
 2020-07-27 12:27:35 +02:00
GriffinR
36a4764a78 Document some slot machine data 2020-07-26 02:15:59 -04:00
PokeCodec
c5aa91741b Change signedness and add casts to avoid implicit conversion warnings 2020-07-24 22:18:57 -04:00
GriffinR
aca50c87be Continue new contest documentation 2020-07-24 00:14:53 -04:00
GriffinR
52a4428ba6 Begin new contest documentation 2020-07-23 17:55:40 -04:00
GriffinR
4a42e2a710
Merge branch 'master' into doc-overworld 2020-07-23 10:31:52 -04:00
PikalaxALT
5348674bc4
Merge pull request #1102 from GriffinRichards/doc-faraway 
Document faraway island
 2020-07-23 09:12:19 -04:00
GriffinR
a4e47f1201 Clean some battle_message.c data 2020-07-23 05:01:42 -04:00
DizzyEggg
af5090c892
Update agb_flash.c 2020-07-22 19:25:09 +02:00
GriffinR
bfa7dfcd58
Merge pull request #1105 from AsparagusEduardo/Coordinates 
Changed mon front and back coordinates from hex to decimal so they're easier to edit.
 2020-07-21 19:43:14 -04:00
Eduardo Quezada
6eccf019db Fixed missing changes. 2020-07-21 19:32:33 -04:00
PokeCodec
97ceca6527 Match AnimTask_RotateAuroraRingColors_Step 2020-07-21 16:11:11 -04:00
Eduardo Quezada
f825ba875e Reverted size. 2020-07-19 21:17:32 -04:00
Eduardo Quezada
49ee0fd953 Front pic coordinates. 2020-07-19 20:54:12 -04:00
Eduardo Quezada
10c4debe31 Back pic coordinates 2020-07-19 20:37:11 -04:00
GriffinR
2273458d50 Label option menu pal 2020-07-19 15:44:58 -04:00
GriffinR
a1cc7d2bd6 Document faraway island 2020-07-19 14:12:38 -04:00
Eduardo Quezada
551334b20b Fixed missing lowercase field name. 2020-07-18 23:10:37 -04:00
Eduardo Quezada
3bec840419 Fixed field names lowercase. 2020-07-18 23:08:44 -04:00
Eduardo Quezada
9b32cafd57 Some PSS documentation. 2020-07-18 21:58:01 -04:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld 2020-07-18 20:24:09 -04:00
GriffinR
8e6dd3bafe
Merge pull request #1086 from GriffinRichards/doc-unktrans 
Document unk_transition
 2020-07-18 20:22:58 -04:00
GriffinR
1a27af8855
Merge pull request #1100 from GriffinRichards/clean-battlescrdata 
Misc battle and battle palace documentation
 2020-07-18 20:22:44 -04:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
GriffinR
1cf2470aac
Merge pull request #1097 from PokeCodec/asm 
Allow assembly on Clang
 2020-07-17 18:19:06 -04:00
GriffinR
96fd719a19
Merge pull request #1081 from GriffinRichards/add-localids 
Add local object event ids for referenced objects
 2020-07-17 18:18:47 -04:00
GriffinR
50e48898d2
Merge pull request #1088 from GriffinRichards/doc-starterchoose 
Document starter_choose.c
 2020-07-17 16:02:10 -04:00
PokeCodec
98441b1199 Sort out asm 2020-07-16 18:28:38 -04:00
Evan
593860b0be format fix 2020-07-16 11:13:03 -06:00
Evan
f923f5198e add oval charm 2020-07-16 09:48:25 -06:00
DizzyEggg
c8e1079736
Use stat constants in MonGainEVs 2020-07-16 09:58:16 +02:00
ghoulslash
ad95f150a9
Expand Pokeball Substructure (#473) 
* expand ball struct element

* remove test case
 2020-07-16 09:10:21 +02:00
GriffinR
7bea28cb84
Merge pull request #1093 from GriffinRichards/fix-frontiermonconst 
Clean up some frontier mon use in battle factory
 2020-07-15 13:37:07 -04:00
DizzyEggg
6537310387 Merge with master 2020-07-15 10:23:58 +02:00
GriffinR
0c4f3b269e
Merge pull request #1083 from GriffinRichards/playse-constants 
Use charmap constants for PLAY_SE
 2020-07-15 02:53:53 -04:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
GriffinR
3c356a1d7a
Merge pull request #1082 from GriffinRichards/add-flagvarsave 
Allow flag/var counts to be updated alongside values
 2020-07-14 19:58:38 -04:00
GriffinR
a583dfcc42
Merge pull request #1094 from DizzyEggg/rename 
Give proper names to some functions
 2020-07-14 19:56:46 -04:00
GriffinR
c177872c9c
Merge pull request #1080 from AsparagusEduardo/EndBalls 
Created constant for easier Ball Expansion.
 2020-07-14 19:56:20 -04:00
DizzyEggg
0425cb66ef Give proper names to some functions 2020-07-14 11:13:03 +02:00
GriffinR
1c75396276 Clean up some frontier mon use in battle factory 2020-07-13 00:47:30 -04:00
Eduardo Quezada
b31efcd6e3 Renamed constant, 2020-07-12 01:49:32 -04:00
PikalaxALT
535189bf14 Fix some UB exposed with GCC 10.1.0 2020-07-11 10:22:34 -04:00
DizzyEggg
da3062097a Merge 2020-07-11 12:58:59 +02:00
DizzyEggg
e03fea84d0 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-11 12:46:41 +02:00
Flametix
4ba2799849 Update pokemon.c 2020-07-09 14:52:19 -04:00
GriffinR
beeb673ba1 Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave 2020-07-08 16:03:32 -04:00
GriffinR
ebb6c4ee66
Merge branch 'master' into doc-overworld 2020-07-08 15:51:58 -04:00
GriffinR
89bcf3cbd9
Merge branch 'master' into add-localids 2020-07-08 15:47:45 -04:00
GriffinR
431c60c92c Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti 2020-07-08 15:45:31 -04:00
PikalaxALT
8b80b417e2
Merge pull request #1069 from GriffinRichards/doc-link 
Document linking
 2020-07-08 15:43:45 -04:00
PikalaxALT
550875757b
Merge pull request #1087 from ipatix/fix_aggressive_loop_optimizations 
fix aggressive loop optimizations
 2020-07-08 15:42:08 -04:00
PokeCodec
938aec45d3 Match CreatePokeDexList 
Cherry-picked from the pret Ruby repo
 2020-07-07 20:57:20 -04:00
GriffinR
43c48d95c2 Document starter_choose.c 2020-07-06 17:26:25 -04:00
GriffinR
c0bc7e8f7b Fix elevator metatile typo 2020-07-06 16:02:49 -04:00
Michael Panzlaff
3264cf697f fix aggressive loop optimizations 
Previously, aggressive loop optimizations with a new compiler were not
possible due to undefined behaviour at end of arrays.

A macro "UBFIX" is added to allow ifdefs for fixes which resolve
undefined behavior. For example newer GCC versions will detect various
bugs in the original game code and will otherwise not compile with -Werror.
 2020-07-05 18:09:59 +02:00
GriffinR
72edc46ab6 Document unk_transition 2020-07-02 15:45:37 -04:00
GriffinR
1ce929157f Clean up field effect doc 2020-07-02 05:05:13 -04:00
GriffinR
8589e138a8 Eliminate METATILE_ID() macro 2020-07-02 00:17:14 -04:00
GriffinR
c84f98a7ff Document misc field control 2020-06-29 17:24:17 -04:00
GriffinR
abdf7cbf02 Label fishing effect functions 2020-06-29 16:53:38 -04:00
GriffinR
eb80012757 Document more misc field effects 2020-06-29 16:32:46 -04:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR
7d5ad8f7b4 Use charmap constants for PLAY_SE 2020-06-26 02:44:07 -04:00
GriffinR
06025e887f Allow flag/var counts to be updated alongside values 2020-06-24 17:00:19 -04:00
GriffinR
18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
GriffinR
fac6288156 Add local object event ids for referenced objects 2020-06-22 17:18:58 -04:00
Eduardo Quezada
0be261cc74 Fixed Eviolite description. 2020-06-21 04:25:08 -04:00
Eduardo Quezada
7244b80fc6 Created constant for easier Ball Expansion. 2020-06-21 02:36:46 -04:00
GriffinR
8b462f3f6c Specify confetti util name 2020-06-18 18:14:30 -04:00
GriffinR
d2a760afdb Rename contest_link_80FC4F4, 80F57C4, and 81D9DE4 2020-06-18 18:01:32 -04:00
GriffinR
24569583e4 Document contest results 2020-06-18 17:50:13 -04:00
GriffinR
f600aff711 Rename rom_81520A8 2020-06-17 03:42:10 -04:00
GriffinR
76f6d05173 Document confetti 2020-06-17 03:39:03 -04:00
GriffinR
e507770425 Remove some unneeded link filler 2020-06-15 13:17:53 -04:00
GriffinR
c2a07276ae
Merge branch 'master' into doc-link 2020-06-13 16:15:11 -04:00
Sierra A
46f4a4bbf7
Merge pull request #1074 from Sierraffinity/item-menu-cleanup 
Begin item_menu.c cleanup
 2020-06-10 17:17:35 -07:00
Sierra A
a05eea9312
Merge pull request #1075 from Sierraffinity/master 
Fix out of bounds array access in intro Groudon segment
 2020-06-10 17:16:04 -07:00
GriffinR
a9a427c6f2
Merge branch 'master' into doc-link 2020-06-10 17:36:43 -04:00
GriffinR
2859900ea9 Second pass on documenting union room 2020-06-10 17:30:59 -04:00
Sierraffinity
452f1e0047 Fix out of bounds array access in intro Groudon segment 2020-06-10 13:27:46 -07:00
Sierra A
a7815857ad
Merge pull request #1071 from PokeCF/patch-3 
Unnest if statements
 2020-06-10 13:23:57 -07:00
Sierraffinity
74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
nullableVoidPtr
8381828571 Match sub_80F0708 
Special thanks to @kazblox
 2020-06-10 21:13:58 +08:00
PokeCF
760baec098
Unnest if statements 
Overall, it is generally considered bad style to continually nest loops. However, if this is what the decompiler outputted, then why bother touching it?

However, this can be rewritten as returning early if the playtime is less than 60.

The reason for this is not because of the original code, but because it looks better, has the same output, and is easier to understand.
 2020-06-08 17:09:54 -04:00
GriffinR
35867f531b Some link rfu cleanup / link.c documentation 2020-06-08 15:24:25 -04:00
GriffinR
c98342c973 Document link_rfu_3.c 2020-06-08 00:28:21 -04:00
GriffinR
e6f5c4f264 Sync link_rfu_2.c 2020-06-07 12:54:50 -04:00
GriffinR
3f97763181 Document cable_club.c 2020-06-06 16:10:03 -04:00
huderlem
675f5ac03e Remove unnecessary comment 2020-06-03 19:55:15 -05:00
SBird
5d752bbe49 shop: document some constants s.t. object events don't break 2020-06-03 19:55:15 -05:00
GriffinR
aaf5d91c18 Document field_message_box.c 2020-06-03 19:47:45 -05:00
GriffinR
9190af73b7 Label union room battle trainer 2020-06-03 15:28:29 -04:00
GriffinR
fd77eb1eb9 Document wireless_communication_status_screen.c 2020-06-03 14:07:40 -04:00
GriffinR
bc6bd36813 Document union_room_battle.c 2020-06-02 19:05:59 -04:00
GriffinR
18a00da820 Split wireless_communication_status_screen.c out 2020-06-02 18:51:26 -04:00
GriffinR
7632404ba5 Document union_room_chat.c 2020-06-02 18:35:00 -04:00
DizzyEggg
0690abd5a4 its time to ddddddduel 2020-06-02 17:28:47 +02:00
DizzyEggg
754266cb0f battle transitions 2020-06-02 13:32:30 +02:00
DizzyEggg
f608ae9f70 make battle transition OK ok Ok oK 2020-06-02 13:30:05 +02:00
PikalaxALT
72b332d551
Revert "More transitions documentation" 2020-06-01 18:05:31 -04:00
GriffinR
f53e2491bf Document union_room_player_avatar.c 2020-06-01 10:23:12 -04:00
DizzyEggg
ab3eb6065b More transitions documentation 2020-06-01 16:17:25 +02:00
GriffinR
4fe507e453 Document union_room.c 2020-05-31 13:11:18 -04:00
DizzyEggg
b1ffe6efd7
Battle transition arrays easier to edit 2020-05-31 12:41:27 +02:00
PikalaxALT
24075e9e72
Merge pull request #1061 from GriffinRichards/fix-egg 
Clear up misleading egg step name
 2020-05-29 16:50:37 -04:00
PikalaxALT
e0ae696479
Merge pull request #1027 from PikalaxALT/gbagfx_tilemap 
Add tilemap rendering capability to gbagfx
 2020-05-29 16:49:46 -04:00
GriffinR
e27c3d2abd Clear up misleading egg step name 2020-05-27 16:41:23 -04:00
Sierraffinity
d528d75af7 Connect title screen BG palettes together 2020-05-27 07:58:48 -05:00
Sierraffinity
6963c00016 battle_anim_mons: Make cast not depend on size of struct 2020-05-27 07:58:48 -05:00
Sierraffinity
ec92241d8f Fix REG_OFFSET_WININ/OUT mislabeling 2020-05-27 07:58:48 -05:00
Sierraffinity
42747663b5 Fix OAM region mislabeling 2020-05-27 07:58:48 -05:00
MandL27
c3d690a380 consistency with pokefirered 2020-05-27 07:58:04 -05:00
MandL27
6964d37db6 document UNKNOWN_A special char 2020-05-27 07:58:04 -05:00
DizzyEggg
5eeecb56c1 More touches to pokemon summary screen document 2020-05-27 07:57:15 -05:00
Marcus Huderle
79a1127122 Match sub_817F9F4 2020-05-24 17:22:56 -05:00
GriffinR
f9e6f7540f Use fixed point macros for math util 2020-05-24 08:28:02 -05:00
GriffinR
c6205b3df4 Document math_util.c 2020-05-24 08:28:02 -05:00
GriffinR
210862f7b6 Match InBoxInput_Normal, HandleInput_InParty, HandleInput_OnBox, and HandleInput_OnButtons 2020-05-24 08:26:38 -05:00
GriffinR
5019381911 Match sub_8024604 2020-05-24 08:26:38 -05:00
GriffinR
89350cb81a Clean up sub_8022C58 2020-05-24 08:26:38 -05:00
GriffinR
b29c7554ea Match sub_8022250 2020-05-24 08:26:38 -05:00
hondew
cfc47e642f Clean up slot drawing 
Fix typos
 2020-05-24 08:24:20 -05:00
hondew
26a197847a Rename tag offset functions 
Fix typo
 2020-05-24 08:24:20 -05:00
LOuroboros
705743a10e
Fix the secondaryId of the Ice and Fighting Gems (#382) 
Addresses #378
 2020-05-24 10:18:07 +02:00
Sierra A
25f0dac1b5
Merge pull request #1055 from Sierraffinity/mystery_gift_fakematchfix 
Fix mystery gift fakematchings
 2020-05-20 21:08:31 -07:00
Sierra A
783ebfe163
Merge pull request #1052 from Missingmew/unused-decompress 
Decompile unused decompress function, as seen in ruby
 2020-05-20 21:06:47 -07:00
Sierraffinity
ac6bcecdf5 Fix mystery gift fakematchings 2020-05-20 21:00:21 -07:00
Sierra A
7b16d6b6f0
Merge pull request #1054 from Sierraffinity/battle_dome_fakematchfix 
Fix HblankCb_TourneyTree fakematch
 2020-05-20 20:40:24 -07:00
Sierraffinity
929e64ad33 Fix HblankCb_TourneyTree fakematch 2020-05-20 20:31:16 -07:00
Sierra A
02416dc79c
Merge pull request #1053 from Sierraffinity/text-drawdownarrow-fix 
Fix TextPrinterDrawDownArrow fakematch
 2020-05-20 19:50:52 -07:00
Sierraffinity
d301d438c1 Fix the fix 2020-05-20 19:33:40 -07:00
Missingmew
9a13be4e7b switch to pret short-types and tabs vs spaces 2020-05-21 00:25:30 +02:00
Missingmew
1beca515ed Decompile unused function, as seen in ruby 2020-05-20 23:58:20 +02:00
GriffinR
2a1781b2ed sPrizeListGigaSwap typo fix 2020-05-19 16:13:25 -04:00
PikalaxALT
7c248947f4
Merge pull request #1038 from ProjectRevoTPP/master 
restore SeedRngWithRtc comment and declaration of GF oversight.
 2020-05-19 13:31:41 -04:00
PikalaxALT
3c4b9dfacc
Merge pull request #1044 from DizzyEggg/sss 
Document pokemon summary screen
 2020-05-19 13:30:42 -04:00
Sierra A
da30244b6c
Merge pull request #1041 from AsparagusEduardo/UnownStats 
Using ability constants for OLD_UNOWN stats
 2020-05-18 16:33:23 -07:00
Sierra A
ab6bbd7ef0
Merge pull request #1039 from GriffinRichards/doc-inconnect 
Label in_connection's field in ObjectEventTemplate
 2020-05-18 16:32:55 -07:00
DizzyEggg
bdebab834c Document pokemon summary screen 2020-05-18 14:03:01 +02:00
GriffinR
db17f8091c Fix CreatedHatchedMon typo 2020-05-17 01:06:17 -04:00
AsparagusEduardo
179d84dcd7 Using ability constants for OLD_UNOWN stats 2020-05-16 18:08:56 -04:00
GriffinR
5bb688df3e Label in_connection's field in ObjectEventTemplate 2020-05-14 17:11:18 -04:00
ProjectRevoTPP
468793e34a restore SeedRngWithRtc comment and declaration of GF oversight. 2020-05-14 16:33:19 -04:00
Sierraffinity
a1244aa5dd Merge branch 'master' of github.com:pret/pokeemerald 2020-05-04 20:54:27 -07:00
Sierra A
b398ef344f
Merge pull request #1030 from SBird1337/gfx/fix-hp-anim 
gfx: fix hpbar_anim.png visual palette
 2020-05-03 11:40:32 -07:00
SBird
7c4c1d3a5c gfx: merge battle_interface gfx table 2020-05-03 15:24:33 +02:00
Sierra A
8778aec7d6
Merge pull request #1031 from hondew/berry-yield 
Document minor berry yield bug
 2020-05-03 02:26:18 -07:00
Sierra A
5c49bc6d34
Merge pull request #1032 from AsparagusEduardo/OldUnown 
Ordered OLD_UNOWN in the same way as the other base stats.
 2020-05-03 02:24:48 -07:00
DizzyEggg
a35ce6ecdf
Give a define for all dex interface sprites 
for easier editing
 2020-05-03 11:12:05 +02:00
AsparagusEduardo
f6932518b0 Ordered OLD_UNOWN in the same way as the other base stats. 2020-05-03 00:00:01 -04:00
hondew
84f012fc6e Update external links 2020-05-02 13:59:28 -04:00
hondew
048d1ffbdb Clarify stages 2020-05-02 13:38:25 -04:00
hondew
49184cd799 Document berry yield 
fix wording
 2020-05-02 11:51:49 -04:00
DizzyEggg
f86282f423 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-29 08:47:51 +02:00
GriffinR
cb5b8da77b More trainer type usage 2020-04-28 19:59:08 -05:00
GriffinR
8d9e39e6d1 Sync map types with pokefirered 2020-04-28 19:59:08 -05:00
GriffinR
09b39527ff Generalize oamtable names 2020-04-28 19:59:08 -05:00
GriffinR
ecd4824f67 Index heal location data, use better names 2020-04-28 19:59:08 -05:00
GriffinR
b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
jiangzhengwenjz
c7d8d5dae2 fix remainSize type 2020-04-28 07:28:27 +08:00
jiangzhengwenjz
2010ed0f12 librfu issues 2020-04-28 07:25:55 +08:00
Sierraffinity
072a98ca9a Document undefined sprite template behavior 2020-04-25 18:25:55 -07:00
PikalaxALT
14f76fbe03 Add tilemap rendering capability to gbagfx 2020-04-24 08:47:22 -04:00
LOuroboros
32bb717bf1
Implemented missing TMs/HMs type palettes (#327) 
* Implemented palettes for Bug type and Fairy type TMs/HMs thanks to Ghoulslash

* Actually added the Bug and Fairy type TM/HM sprite palettes now
 2020-04-16 09:27:13 +02:00
PlatinumMaster
3ff8b0cb5c Remove debug sound check. 2020-04-15 14:19:46 -04:00
PlatinumMaster
1b696e8119 Finalized pull request. 2020-04-15 13:35:12 -04:00
AsparagusEduardo
6eefcb1f82 Using sandstorm weather constant for Sand Veil encounter rate. 2020-04-15 07:40:39 -05:00
DizzyEggg
09dcff81f8 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-15 13:28:10 +02:00
PikalaxALT
a12de6e480
Merge pull request #1022 from GriffinRichards/doc-gcn 
Label GCN link flags field
 2020-04-14 15:54:34 -04:00
GriffinR
8d3b7bd0b1 Use metatile labels for decor gfx 2020-04-13 14:43:50 -04:00
GriffinR
96958ba5e9 Drop unnecessary decor prefix 2020-04-13 13:04:22 -04:00
GriffinR
dde4a0416c Label GCN link flags field 2020-04-13 08:42:31 -04:00
brain_face
9abda59bd1 Renamed sub_808C1B4 -> PlayerUseAcroBikeOnBumpySlope 2020-04-12 16:22:03 +02:00
brain_face
007a038031 Renamed sub_808B9D4 -> PlayerEndWheelieWhileMoving 2020-04-12 15:43:45 +02:00
brain_face
ce2fe10bec Renamed sub_808B9A4 -> PlayerPopWheelieWhileMoving 2020-04-12 15:35:38 +02:00
brain_face
1be48a61c1 Renamed sub_808B9BC -> PlayerWheelieMove 2020-04-12 15:31:11 +02:00
brain_face
1472a3a7d4 Renamed sub_808B980 -> PlayerWheelieInPlace 2020-04-12 14:38:18 +02:00
PikalaxALT
7eaabab3f0
Merge pull request #1020 from GriffinRichards/doc-unkanim 
Give partial labels to unknown anims
 2020-04-10 14:07:23 -04:00
PikalaxALT
c08b4ff3e1
Merge pull request #1019 from GriffinRichards/constants-party 
Add misc party constant usage
 2020-04-10 14:05:35 -04:00
PikalaxALT
8188615db8
Merge pull request #1018 from GriffinRichards/sync-util 
Sync link game util files
 2020-04-10 14:02:53 -04:00
PikalaxALT
384a7cdef8
Merge pull request #1011 from GriffinRichards/doc-avflag 
Minor player avatar doc
 2020-04-10 13:56:52 -04:00
PikalaxALT
6133c6b0af
Merge pull request #1006 from AsparagusEduardo/UsingBattleAction 
Using Battle Action constants
 2020-04-10 13:56:25 -04:00
GriffinR
2615a6838e Label unknown anims 2020-04-09 19:24:47 -04:00
GriffinR
7a5deff0bc Add misc party constant usage 2020-04-09 15:18:53 -04:00
GriffinR
e485857df3 Sync minigame_countdown 2020-04-08 17:23:32 -04:00
GriffinR
8853588af0 Sync digit_obj_util 2020-04-08 16:27:11 -04:00
jiangzhengwenjz
afdcb69bf4 better matching approach than upstream 2020-04-02 20:30:31 +08:00
jiangzhengwenjz
61b7b45084 Merge branch 'master' of https://github.com/pret/pokeemerald into nonmatching 2020-04-02 20:26:16 +08:00
Sewef
1c895bb8d0
Match HighlightSubmenuScreenSelectBarItem 2020-04-02 13:17:33 +02:00
Sewef
096e57f56c
Match HighlightScreenSelectBarItem 2020-04-02 13:11:18 +02:00
jiangzhengwenjz
0fe5ff34dc Pokeblock_BufferEnhancedStatText 2020-04-02 13:53:53 +08:00
jiangzhengwenjz
cd60736e36 PrintMonWeight 2020-04-02 12:15:03 +08:00
jiangzhengwenjz
69f6d2afad HighlightSubmenuScreenSelectBarItem 2020-04-02 01:03:44 +08:00
jiangzhengwenjz
3d2c42adfe HighlightScreenSelectBarItem 2020-04-02 01:03:25 +08:00
GriffinR
487080b425 Minor player avatar doc 2020-04-01 02:54:26 -04:00
Sewef
685f120b5e
Fix 'AnimMovmentWaves' typo 2020-03-27 14:50:15 +01:00
GriffinR
8e4b987699 Revert more porymap-breaking changes 2020-03-18 03:22:07 -04:00
AsparagusEduardo
f45336c546 Using Battle Action constants 2020-03-17 22:14:14 -03:00
GriffinR
ab87c90998 Revert city_zoom_tiles.png name 2020-03-17 12:08:05 -04:00
PikalaxALT
39da49495d
Merge pull request #1000 from GriffinRichards/doc-dex 
Document pokedex.c
 2020-03-17 10:43:57 -04:00
PikalaxALT
784e29352d
Merge pull request #985 from mrgriffin/decoration 
Document decoration.c
 2020-03-17 10:39:37 -04:00
PikalaxALT
7a059c75a6
Merge pull request #968 from GriffinRichards/doc-regionmap 
Document some pokenav and region map
 2020-03-17 10:38:20 -04:00
DizzyEggg
fd34afac1e Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-03-13 22:44:35 +01:00
garakmon
b1dd945cbf move fonts from data/graphics/ to graphics/ 2020-03-12 13:40:00 -04:00
AsparagusEduardo
c73fdb8954 Restored some tItemCount instances as requested. 2020-03-10 17:46:26 -05:00
AsparagusEduardo
130929a7a4 Slight item_menu.c documentation 2020-03-10 17:46:26 -05:00
AsparagusEduardo
97096aab07 Applied review changes 2020-03-10 17:45:29 -05:00
AsparagusEduardo
1b9a01798e monMarks 2020-03-10 17:45:29 -05:00
AsparagusEduardo
fdf1faa563 SetMonIconTransparency 2020-03-10 17:45:29 -05:00
AsparagusEduardo
1159180a25 sMovingItemId 2020-03-10 17:45:29 -05:00
AsparagusEduardo
f9725affd0 MODE_2 renamed to MODE_MOVING 2020-03-10 17:45:29 -05:00
GriffinR
a495379ff0 Document pokedex cry screen 2020-03-10 14:02:03 -04:00
GriffinR
31b0cbe9b4 Document pokedex.c 2020-03-09 16:24:01 -04:00
Eduardo Quezada
f821303429 Using True/False on SetMoveEffect. 2020-03-07 16:54:13 -06:00
DizzyEggg
b5c54d404d Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-03-06 11:38:32 +01:00
Martin Griffin
4485d51522 Document decoration.c 2020-03-06 09:47:20 +00:00
jiangzhengwenjz
93f0bff49c sub_8021A28 2020-03-06 07:01:12 +08:00
jiangzhengwenjz
69aff34afd sub_8027E30 2020-03-06 05:31:27 +08:00
GriffinR
8e1e09562e Use array count for InitBgsFromTemplates 2020-03-03 22:46:48 -05:00
PikalaxALT
9259b378ef
Merge pull request #991 from GriffinRichards/fix-eventticket 
Clarify event ticket flag names
 2020-03-03 16:15:27 -05:00
GriffinR
b6c9ad505d Minor fixes in trainer_battle.inc 2020-03-03 14:47:14 -05:00
GriffinR
4637085390 Clarify event ticket flag names 2020-03-03 01:36:20 -05:00
DizzyEggg
f2760e3083 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-02-29 09:47:14 +01:00
ultima-soul
1b048c0ecf
Fix grass and Pokemon Center monitor palette issues. (#296) 2020-02-29 09:22:37 +01:00
PikalaxALT
afe081cbba Match MultiplyInvertedPaletteRGBComponents and MultiplyPaletteRGBComponents 2020-02-27 14:00:36 -06:00
GriffinR
172cb7bae9 Sync Unown and qmark mon folders with pokefirered 2020-02-25 14:18:28 -06:00
GriffinR
51cd0ac081 Rename battle anim type files, remove unneeded ARG_RET_IDs 2020-02-25 12:54:08 -06:00
GriffinR
dc3c2b72f2 Clean up move anim doc 2020-02-25 12:54:08 -06:00
GriffinR
68dc68907b Label move anim data 2020-02-25 12:54:08 -06:00
GriffinR
efd53d080c Clean up battle anim C for doc 2020-02-25 12:54:08 -06:00
GriffinR
afa1ae2209 Finish documenting move anim scripts 2020-02-25 12:54:08 -06:00
GriffinR
e633b57593 Document remaining status/general/special anims 2020-02-25 12:54:08 -06:00
GriffinR
208057d7ae Document move anims S-Z 2020-02-25 12:54:08 -06:00
GriffinR
0d651c7c9e Some battle anim review changes 2020-02-25 12:54:08 -06:00
GriffinR
1ba12dc050 Document move anims I-S 2020-02-25 12:54:08 -06:00
GriffinR
501d0d3c18 Document move anims C-H 2020-02-25 12:54:08 -06:00
GriffinR
faf0ba8662 Use macro for randomization with ISO value 2020-02-25 12:54:08 -06:00
GriffinR
6eb44dc507 Document move anims A-C 2020-02-25 12:54:08 -06:00
GriffinR
b1d131ace2 Convert base_stats.h to UTF-8 2020-02-25 12:46:03 -06:00
DizzyEggg
13c0c64d70 Merge with master 2020-02-23 12:41:36 +01:00
Eduardo Alvaro Quezada D'Ottone
0c0af89024
Ordered unordered item graphics and palettes. (#269) 2020-02-22 23:44:30 +01:00
jiangzhengwenjz
097b847303 sub_802C838 2020-02-19 06:23:01 +08:00
GriffinR
3456578c0f Move berry crush data to src 2020-02-17 13:10:23 -06:00
GriffinR
f6275cce57 Misc constant use in TV 2020-02-17 13:09:35 -06:00
GriffinR
e7ff7fb032 Fix move relearner struct 2020-02-17 13:08:03 -06:00
Eduardo Alvaro Quezada D'Ottone
2c172a3636
Shiny charm (#276) 
* Shiny Charm Item

* Shiny Charm Rerolls
 2020-02-17 11:08:06 +01:00
PikalaxALT
867734a791 Fix alignment in AgbRfu_LinkManager.h 2020-02-16 15:32:10 -05:00
PikalaxALT
91dd7f5cc3 Port librfu from firered 2020-02-16 13:49:36 -05:00
GriffinR
ac1738e11d Move smokescreen data to src 2020-02-13 14:48:19 -06:00
GriffinR
d11cd5d217 Move text input strings to src 2020-02-13 14:48:19 -06:00
Marcus Huderle
49421a41b2 Move field effects data and graphics into own directory, and cleanup naming for object events 2020-02-12 17:32:51 -06:00
GriffinR
956090b05f Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-02-12 13:05:57 -05:00
GriffinR
689acd3613 Move slot machine data to src 2020-02-09 14:11:50 -06:00
GriffinR
084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
GriffinR
faeb974c46 Minor berry fix data clean up 2020-02-08 14:23:41 -06:00
GriffinR
43ec11b92a Move berry powder data to src 2020-02-08 14:22:53 -06:00
GriffinR
d1035f027e Move contest_link_80F57C4 data to src 2020-02-08 14:22:53 -06:00
GriffinR
85dc8a528c Move rotating tile puzzle data to src 2020-02-08 14:22:53 -06:00
GriffinR
86354f1d50 Document some pokenav and region map 2020-02-05 21:04:43 -05:00
GriffinR
27c4329e45 Use friendship event constants 2020-02-04 12:16:15 -06:00
GriffinR
8a96aa9e97 Name pokenav files 2020-02-04 08:02:28 -06:00
GriffinR
be5d417236 Document some pokenav menu handlers 2020-02-04 08:02:28 -06:00
Sebastian Gabl
0cf84d13ef Use correct prefix 2020-02-04 07:42:04 -06:00
Sebastian Gabl
0bd9639478 Name Wally struct and use bag macros 2020-02-04 07:42:04 -06:00
PikalaxALT
462acaa7dc sCombinedMoves 2020-02-01 12:07:40 -05:00
DizzyEggg
bf6aa6a176 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-01-31 22:02:10 +01:00
GriffinR
9c934c9664 Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers 2020-01-26 12:23:08 -05:00
GriffinR
9a6c2c25d0 Add some capacity constants 2020-01-26 09:42:55 -06:00
GriffinR
7232bfecc2 Name null palettes 2020-01-26 09:40:35 -06:00
GriffinR
a152900211 Combine animated door frames 2020-01-26 09:40:35 -06:00
GriffinR
25d7577d9d Label animated doors 2020-01-26 09:40:35 -06:00
Sahith Nallapareddy
25df146054 using item constant 2020-01-20 07:51:18 -06:00
GriffinR
4c12ad00d2 Merge branch 'master' into fix-eventobj 2020-01-19 21:57:29 -05:00
GriffinR
a40f054900 Move/rename gfx start/end vars 2020-01-18 08:49:34 -06:00
DizzyEggg
044f070020 Merge with master 2020-01-18 15:04:56 +01:00
jiangzhengwenjz
aa631825fc resolve data sections 2020-01-16 08:14:27 -06:00
jiangzhengwenjz
46b00b11d4 match all the functions 2020-01-16 08:14:27 -06:00
jiangzhengwenjz
c2be2e8c69 sync documentation from firered 2020-01-16 08:14:27 -06:00
jiangzhengwenjz
8a5f292618 document symbols 2020-01-16 08:14:27 -06:00
GriffinR
ea8b1011d3 Merge master into fix-eventobj 2020-01-15 16:11:20 -05:00
Sebastian Gabl
5fff2f2234 Use SHINY_ODDS macro where intended 
The 3 locations where SHINY_ODDS was added generate mon sprites for
display in the dex, at game start and on starter choice.
The arguments are intended for otId but in this case they are set to the
same value as SHINY_ODDS to prevent the pictures created from using the
shiny palette.
 2020-01-15 08:10:20 -06:00
Marcus Huderle
755ae0facc Use empty braces for last null entry in sTransitionTypes array 2020-01-13 20:31:40 -06:00
Marcus Huderle
5a2d676e71 Merge remote-tracking branch 'upstream' into tustin2121-patch-5 2020-01-13 20:26:20 -06:00
GriffinR
22931846d6 Fix Colosseum name porymap issue 2020-01-13 20:20:48 -06:00
GriffinR
e92cc7752b Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-01-13 20:41:57 -05:00
huderlem
6d6c57f383
Merge pull request #953 from GriffinRichards/sync-script 
Port some macro/script fixes from pokefirered
 2020-01-13 19:33:47 -06:00
GriffinR
c19289596d Give/Take to Add/Remove for silent script macros 2020-01-12 23:24:52 -05:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
huderlem
fa5816915d
Merge pull request #949 from GriffinRichards/doc-dome 
Document Battle Dome and add facility party constants
 2020-01-12 20:10:03 -06:00
GriffinR
43962fe141 Fix BuffeInGameTradeMonName typo 2020-01-12 19:45:04 -06:00
GriffinR
10220d3b76 Label TryRecordMixLinkup 2020-01-12 19:39:30 -06:00
GriffinR
e736c2d2fd Document some easy chat specials 2020-01-12 19:39:30 -06:00
GriffinR
6a470ddfda Some script clean up, document secret base secrets show 2020-01-12 19:39:30 -06:00
GriffinR
0284014e0e Add missing save status use 2020-01-12 18:42:41 -06:00
GriffinR
58e64b9524 Clean up some of save.c 2020-01-12 18:42:41 -06:00
PikalaxALT
98b2ab9a77 Match sub_8072308 2020-01-10 16:38:47 -05:00
GriffinR
635267ce32
Merge branch 'master' into fix-eventobj 2020-01-08 05:51:49 -05:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome 2020-01-08 01:15:36 -05:00
GriffinR
017fa294b5 Add battle tent mon/trainer constants 2020-01-08 01:07:53 -05:00
GriffinR
fb5bea98ce More battle_dome.c doc 2020-01-07 22:30:37 -05:00
Slawter666
8b1595ebc3 Pokédex search menu documentation 2020-01-06 15:18:58 -06:00
GriffinR
c85ca4b860 Standardize farfetchd spelling 2020-01-06 15:17:11 -06:00
GriffinR
379f7f5149 Add braces to trainer party moves 2020-01-06 15:16:49 -06:00
GriffinR
bb692a03eb Add frontier mon constants 2020-01-03 23:20:11 -05:00
Marcus Huderle
ef751c8d1b Fix formatting and remove unnecessary comments 2019-12-28 12:07:02 -06:00
huderlem
3b05398975
Merge pull request #945 from Fontbane/patch-5 
Give rival and Maxie parties better names
 2019-12-28 12:06:35 -06:00
GriffinR
3efc8199d4 More battle_dome.c documentation 2019-12-25 22:27:33 -08:00
Fontbane
31b4656324 Labels better 2019-12-25 22:39:06 -05:00
Fontbane
2e8c20d72f Update trainers.h 2019-12-25 20:48:40 -05:00
huderlem
8d64bc9df8
Merge pull request #944 from GriffinRichards/doc-itemuse 
Document item_use.c
 2019-12-25 11:59:07 -06:00
huderlem
ee61726136
Merge pull request #936 from GriffinRichards/doc-tower 
Document Battle Tower scripts
 2019-12-25 11:39:20 -06:00
DizzyEggg
9a2888fdbf Merge into master 2019-12-23 16:46:03 +01:00
AJ Fontaine
b80fa767ab
Give rivals and Maxie battles better names 
Name describes where the battle is and for rivals, which starter the player chose.
 2019-12-23 10:42:06 -05:00
GriffinR
749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
GriffinR
68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
Diegoisawesome
026e1108b2
Merge pull request #935 from GriffinRichards/doc-warp 
Document some warp/field screen effect
 2019-12-20 23:44:56 -08:00
GriffinR
ff2d8a9c4e Add frontier trainer constants 2019-12-20 21:14:05 -05:00
Diegoisawesome
773a599bbb
Merge pull request #942 from jiangzhengwenjz/DrawTradeMenuPartyInfo 
'real' match DrawTradeMenuPartyInfo
 2019-12-20 15:49:14 -08:00
jiangzhengwenjz
4d8ea3a2d9 CanSpinTradeMon 2019-12-21 06:18:20 +08:00
jiangzhengwenjz
681d929892 DrawTradeMenuPartyInfo 2019-12-21 06:09:59 +08:00
GriffinR
63c8cf97d1 Document Battle Dome scripts and some battle_dome.c 2019-12-20 16:53:33 -05:00
GriffinR
949509aade
Merge branch 'master' into fix-eventobj 2019-12-18 13:16:38 -05:00
GriffinR
23f952b34e Merge master into doc-tower 2019-12-17 21:17:46 -05:00
GriffinR
ddfa0c6298 Document Battle Tower scripts 2019-12-17 20:56:13 -05:00
huderlem
f8cef9a6a8
Merge pull request #932 from jiangzhengwenjz/berry_crush 
berry crush
 2019-12-17 19:35:00 -06:00
GriffinR
4879c1eab2
Merge branch 'master' into constants-fade 2019-12-17 19:11:51 -05:00
jiangzhengwenjz
420b4b3fea use STR_CONV_MODE_* constants 2019-12-18 06:42:53 +08:00
jiangzhengwenjz
5bec27aa34 nonmatch sub_8024604 2019-12-18 03:36:51 +08:00
jiangzhengwenjz
67690df65f sub_8023CAC 2019-12-17 23:12:01 +08:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
jiangzhengwenjz
50c48d7ef6 sub_8023BC0 2019-12-17 14:49:57 +08:00
jiangzhengwenjz
efa1ee1822 sub_8022250 2019-12-16 14:17:29 +08:00
jiangzhengwenjz
3f858c1c26 sub_8022F04 2019-12-16 14:17:29 +08:00
GriffinR
db8a5c6c2b
Merge branch 'master' into fix-eventobj 2019-12-15 11:47:27 -05:00
GriffinR
96ec5e1b84 Use fadescreen constants 2019-12-15 11:42:50 -05:00
huderlem
fee36224ed
Merge pull request #925 from GriffinRichards/doc-matchcall 
Document some pokenav match call
 2019-12-15 09:42:13 -06:00
GriffinR
a04347816f Split PokenavMatchCallEntries from PokenavMonList 2019-12-15 10:25:47 -05:00
GriffinR
82f55f2381 Merge master into ObjEvent rename 2019-12-15 02:00:00 -05:00
GriffinR
75b0c9d7a9 Document Battle Pyramid scripts 2019-12-14 08:38:26 -06:00
GriffinR
ea9a2c848a Define start and ends for temp vars and daily/temp/special flags 2019-12-14 08:27:49 -06:00
GriffinR
09840efc64 Name last event_data funcs 2019-12-14 08:27:49 -06:00
GriffinR
1a672dac8d Use constant for daily flag offset 2019-12-14 08:27:49 -06:00
GriffinR
6556b556dd
Merge branch 'master' into fix-eventobj 2019-12-11 01:09:06 -05:00
GriffinR
47b0d8a597
Merge branch 'master' into doc-matchcall 2019-12-10 20:43:27 -05:00
GriffinR
49f1a90534 Document Battle Pike scripts 2019-12-10 19:31:27 -06:00
GriffinR
b7ab9cbf4c Update JP translation and fix typo 2019-12-10 19:29:23 -06:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
GriffinR
8da7a94423
Merge branch 'master' into fix-eventobj 2019-12-10 17:41:08 -05:00
Diegoisawesome
49b56d0136
Merge pull request #929 from jiangzhengwenjz/nonmatching 
fake match InitEventObjectStateFromTemplate
 2019-12-10 14:32:57 -08:00
jiangzhengwenjz
f34b8f564a InitEventObjectStateFromTemplate 2019-12-11 05:35:40 +08:00
DizzyEggg
871e093b65 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-12-09 08:20:29 +01:00
GriffinR
77bf40d32b Fix modern build for #925 2019-12-08 16:57:09 -05:00
GriffinR
51179df017 Clean up match call doc 2019-12-08 15:49:36 -05:00
GriffinR
0086cd1efa More pokenav match call documentation 2019-12-08 15:25:21 -05:00
GriffinR
b93101bbeb Merge master into ObjEvent rename 2019-12-06 21:37:33 -05:00
Slawter666
47ea65b96e Requested changes 2019-12-06 19:06:21 -06:00
Slawter666
9fc176f272 Document pokedex info page 2019-12-06 19:06:21 -06:00
GriffinR
05af6b467c Fix Subsprite formatting 2019-12-06 19:05:44 -06:00
GriffinR
c26e8b8ddb More SPRITE macro usage 2019-12-06 19:05:44 -06:00
GriffinR
2756771958 More usage of ST_OAM constants and SPRITE macros 2019-12-06 19:05:44 -06:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
GriffinR
22fd579fd9 Add comment for ABNORMAL_WEATHER 2019-12-06 19:05:28 -06:00
GriffinR
7f22fc9879 Update old weather names in field_weather_effect 2019-12-06 19:05:28 -06:00
GriffinR
efaea2a3ab Revert WEATHER_CLOUDY to WEATHER_SHADE 2019-12-06 19:05:28 -06:00
GriffinR
a4191040c9 Sync weather names 2019-12-06 19:05:28 -06:00
GriffinR
1b30f0c973 Rename event_obj_lock to event_object_lock 2019-12-06 02:55:30 -05:00
GriffinR
cc9b923dc2 More pokenav match call documentation 2019-12-06 02:35:08 -05:00
GriffinR
c51e0f3bae
Merge branch 'master' into fix-eventobj 2019-12-06 02:34:54 -05:00
GriffinR
467a103bcc Set up Battle Tent macros 2019-12-05 21:11:17 -06:00
GriffinR
fdae25eab2 Set up Battle Pyramid macros 2019-12-05 21:11:17 -06:00
GriffinR
9fcfbdbef5 Set up Battle Factory macros 2019-12-05 21:11:17 -06:00
GriffinR
41c1c9ca8a Set up Battle Pike macros 2019-12-05 21:11:17 -06:00
GriffinR
9b3d1cfab6 Set up Battle Dome and Tower macros 2019-12-05 21:11:17 -06:00
GriffinR
be17c1602d Set up remaining facility script doc, use Palace macros 2019-12-05 21:11:17 -06:00
GriffinR
548af3c0f1 Document a bit of Match Call 2019-12-05 15:33:36 -05:00
DizzyEggg
6e06b08c94 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-11-29 20:55:23 +01:00
AJ Fontaine
2d1a780dd8
Fix Hondrew Berry typo 2019-11-28 11:44:13 -05:00
GriffinR
cb90f22c5e Merge master into ObjEvent rename 2019-11-27 12:51:10 -05:00
GriffinR
8d870d94c9 Document Battle Arena scripts 2019-11-26 18:47:48 -06:00
GriffinR
f559fa3fe2 Merge master into ObjEvent rename 2019-11-25 20:00:04 -05:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
GriffinR
08a8dc46e3 Use macros for Trainer Hill 2019-11-25 18:37:48 -06:00
GriffinR
4dfa959fa2 Begin documenting Battle Pike and Frontier Util 2019-11-25 18:37:48 -06:00
GriffinR
cfdde42b00 Name text speed delays 2019-11-25 09:16:05 -06:00
huderlem
9a81661075
Merge pull request #851 from Sewef/patch-3 
battle_anim_effects_3
 2019-11-24 12:02:54 -06:00
Sewef
07b79c3fc3 battle_anim_effects_3 (5) 2019-11-24 18:00:51 +01:00
huderlem
bef6150b59
Merge pull request #909 from GriffinRichards/doc-apprentice 
Document Apprentice
 2019-11-23 09:27:02 -06:00
GriffinR
f039e897ca Use APPRENTICE_COUNT for record_mixing mod 2019-11-23 10:11:05 -05:00
Sewef
1dfe34dee3 TriForce → TriAttack 2019-11-23 15:51:08 +01:00
Thomas Winwood
e3f7f47321 Turn some magic numbers into named constants 2019-11-23 07:53:26 -06:00
Sewef
4f590e8f61 battle_anim_effects_3 (4) 2019-11-23 11:57:39 +01:00
DizzyEggg
f3f9e47f96 Merge 2019-11-22 23:10:04 +01:00
GriffinR
4c52cf9ed1 Fix event constant file names 2019-11-21 14:03:35 -05:00
GriffinR
8910739d8c Rename mapObect to objectEvent 2019-11-21 01:40:38 -05:00
GriffinR
570881b119 Rename event_object directories 2019-11-21 00:44:55 -05:00
GriffinR
7034f59c14 Rename EventObj to ObjEvent 2019-11-21 00:14:40 -05:00
GriffinR
98b81722e7 Rename field_objet_palettes 2019-11-20 23:54:22 -05:00
GriffinR
82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT 2019-11-20 23:12:51 -05:00
GriffinR
ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
GriffinR
81507fc8b7 Move Apprentice data 2019-11-20 19:04:25 -05:00
GriffinR
b2eb49888d Clean up Apprentice doc 2019-11-20 19:00:08 -05:00
GriffinR
a05006421b Document Apprentice 2019-11-20 17:36:52 -05:00
GriffinR
215bb31d67 Clean up Trainer Fan Club doc 2019-11-20 09:08:24 -06:00
GriffinR
5c5c1836bb Document Trainer Fan Club 2019-11-20 09:08:24 -06:00
Slawter666
c455fcfa59 Pokedex documentation 2019-11-20 09:01:50 -06:00
GriffinR
4e6a69c297 WIP Document Apprentice 2019-11-19 11:36:38 -05:00
GriffinR
a486c8affd Begin documenting Apprentice, merge with master 2019-11-18 12:47:10 -05:00
GriffinR
5393b42f7c Remove SpriteCB_Null name 2019-11-17 08:16:28 -06:00
GriffinR
f7e17ca985 Document Ranking Hall scripts 2019-11-17 08:16:28 -06:00
GriffinR
0dd73a03de Update comment for CheckFinalTime 2019-11-16 13:02:35 -06:00
GriffinR
b96fad074b Rename neverRead fields 2019-11-16 13:02:35 -06:00
GriffinR
3bbdee61b8 Clean up Trainer Hill doc 2019-11-16 13:02:35 -06:00
GriffinR
5e01871f8b Document Trainer Hill 2019-11-16 13:02:35 -06:00
GriffinR
2c3726a328 Document contest strings 2019-11-16 12:50:01 -06:00
GriffinR
248b85c3cb Document Frontier Exchange Corner scripts 2019-11-16 12:00:35 -06:00
GriffinR
57a66bb22d Document Battle Frontier lounges 2019-11-16 11:37:34 -06:00
huderlem
0a43f2ce53
Merge pull request #899 from GriffinRichards/doc-scriptclean 
Document interview and TV scripts, and misc script clean up
 2019-11-16 11:34:47 -06:00
GriffinR
fc3783b739 WIP Document apprentice 2019-11-16 12:28:49 -05:00
GriffinR
eb38922e42 Fix mislabeled SS Tidal movements 2019-11-14 18:07:56 -06:00
GriffinR
0f53aeb19b Document SS Tidal scripts 2019-11-14 18:07:56 -06:00
GriffinR
00f22b6400 Document remaining routes (104, 119-123) 2019-11-14 17:51:02 -06:00
GriffinR
ff7e11c0b0
Merge branch 'master' into doc-scriptclean 2019-11-13 19:25:41 -05:00
GriffinR
ef8370566f Document Contest scripts 2019-11-13 18:20:55 -06:00
GriffinR
af83b41dd1 Document Contest Hall berry blenders and misc 2019-11-13 18:20:55 -06:00
GriffinR
7455bd9b9a Document interview and TV scripts, and misc script clean up 2019-11-12 14:20:05 -05:00
DizzyEggg
e82fc06e08 Match ConvertImageProcessingToGBA 2019-11-12 17:25:02 +01:00
Marcus Huderle
8e65f0188f Rename contest_painting_effects to image_processing_effects 2019-11-10 16:37:26 -06:00
Marcus Huderle
1ed3af66eb Document contest painting image processing effects 2019-11-10 16:37:26 -06:00
GriffinR
a3ee92a4e7 Document some frontier util funcs 2019-11-10 16:37:14 -06:00
DizzyEggg
791ed999d9 Merge 2019-11-10 12:40:11 +01:00
huderlem
ed76620d28
Merge pull request #880 from GriffinRichards/doc-trickhouse 
Document Trick House scripts
 2019-11-09 08:48:49 -06:00
GriffinR
8702972067 Document Sky Pillar outside 2019-11-09 08:41:43 -06:00
Thomas Winwood
a727c16012 Use descriptive constant for ScriptGiveMon call 2019-11-09 08:37:45 -06:00
GriffinR
a38bff8c17 Document Slateport scripts 2019-11-09 08:37:06 -06:00
huderlem
906a1ec4ab
Merge pull request #883 from GriffinRichards/fix-colossname 
Fix Battle Colosseum names
 2019-11-08 17:24:05 -06:00
GriffinR
9140594b23
Merge branch 'master' into doc-littleroot 2019-11-08 03:07:50 -05:00
GriffinR
e19b9c9d46 Resolve Littleroot merge conflict 2019-11-08 03:07:19 -05:00
GriffinR
bef24a45f0 Document Littleroot scripts 2019-11-08 02:47:55 -05:00
huderlem
030784dece
Merge pull request #882 from GriffinRichards/doc-mauville 
Document Mauville and New Mauville scripts
 2019-11-07 20:22:56 -06:00
huderlem
1ceee6ef70
Merge pull request #884 from GriffinRichards/doc-halloffame 
Document a few towns/cities
 2019-11-07 19:55:19 -06:00
huderlem
662a9915cf
Merge pull request #881 from GriffinRichards/doc-caves 
Document cave scripts
 2019-11-07 18:29:48 -06:00
Marcus Huderle
01e6fb6dd0 Document some battle_bg-related things 2019-11-07 18:24:04 -06:00
GriffinR
bae4a586d8 Document Hall of Fame scripts 2019-11-07 13:26:53 -05:00
GriffinR
35ed8de51b Fix Battle Colosseum names 2019-11-07 12:37:11 -05:00
GriffinR
c132989679 Document Mauville scripts 2019-11-07 10:18:56 -05:00
GriffinR
43b7fd741a Document Game Corner scripts 2019-11-07 09:41:59 -05:00
GriffinR
3a00b66407 Document cave scripts 2019-11-07 07:57:51 -05:00
GriffinR
2b944fd721
Merge branch 'master' into doc-trickhouse 2019-11-06 19:49:14 -05:00
GriffinR
25d026aded Document Trick House scripts 2019-11-06 19:41:19 -05:00
GriffinR
fbc3eee1f2 Document Fossil Maniac and Berry Master route houses 2019-11-06 17:01:23 -06:00
GriffinR
58dcd6d99d Clean up mystery event msg 2019-11-06 16:38:02 -06:00
GriffinR
d9da932dad Document Rustboro scripts 2019-11-05 16:43:57 -06:00
GriffinR
5ef300c10b Document dept store 2019-11-04 16:49:06 -06:00
GriffinR
5c627518b3 Rename Grunts to use location-specific names 2019-11-04 16:45:00 -06:00
huderlem
a4b4ecd470
Merge pull request #787 from GriffinRichards/rename-tablecmds 
Rename table cmds
 2019-11-04 16:31:27 -06:00
tustin2121
d4582cb874 Requested change from pkmn to mon 2019-11-04 16:25:46 -06:00
Tustin2121
2fe9d7a81f Document showing pokemon in credits 2019-11-04 16:25:46 -06:00
GriffinR
5f1fcdd023 Document aqua/magma area scripts 2019-11-01 17:22:45 -05:00
GriffinR
dd01942c4f Document aqua/magma hideout scripts 2019-11-01 17:22:45 -05:00
huderlem
6eaac9ea9d
Merge pull request #863 from GriffinRichards/doc-partymenu 
Document party menu
 2019-10-31 21:36:56 -05:00
tustin2121
218fcd99b3 Itemfinder code should use flag constant 2019-10-31 21:34:03 -05:00
GriffinR
27169f634b Review changes for party menu doc 2019-10-31 21:33:01 -04:00
GriffinR
8055548fa4 Document legendary scripts 2019-10-31 18:28:34 -05:00
GriffinR
b1ea2592c3
Merge branch 'master' into doc-partymenu 2019-10-31 14:22:51 -04:00
GriffinR
b33db9b96c Move party menu data 2019-10-31 14:16:43 -04:00
GriffinR
aec7eb6089 Clean up party_menu doc 2019-10-31 14:11:55 -04:00
GriffinR
e01ec84837 Document party_menu second pass 2019-10-31 03:25:56 -04:00
GriffinR
93e2851fc1 Document players_house.inc and Littleroot house scripts 2019-10-30 17:51:35 -05:00
GriffinR
5fd44d1e74 Rename some STAT_CHANGE macros 2019-10-26 11:53:00 -04:00
GriffinR
6db014cc32 Document party_menu first pass 2019-10-25 15:41:06 -04:00
GriffinR
ca2c6fa9b1 Document pc_transfer.inc 2019-10-22 17:57:28 -05:00
GriffinR
9a86769847 Document obtain_item.inc 2019-10-22 17:57:28 -05:00
GriffinR
c0aaa01424 Document flash.inc 2019-10-22 17:57:28 -05:00
GriffinR
5b845bb0a0 Review changes for #852 2019-10-21 17:21:53 -05:00
GriffinR
973e6f9667 Document mauville_man.inc 2019-10-21 17:21:53 -05:00
Sewef
64cf2d70fa battle_anim_effects_3 (3) 2019-10-21 18:36:45 +02:00
Sewef
b24e7a5933 battle_anim_effects_3 (2) 2019-10-21 18:29:59 +02:00
Sewef
c8e0e89f8e battle_anim_effects_3 2019-10-21 18:19:07 +02:00
Sewef
dcefd3c593
Update battle_anim_effects_3.c 2019-10-21 18:01:18 +02:00
Sewef
41e952a668 battle_anims_effects_2 
Fixes
 2019-10-20 12:29:08 -05:00
Sewef
e9675bdd24 battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
def7a4a18a more battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
8531a17e10 battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
e90c708383 battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
3b0d9e134f battle_anims_effects_2 2019-10-20 12:29:08 -05:00
Sewef
49ad6da8fb starting battle_anim_effects_2 2019-10-20 12:29:08 -05:00
GriffinR
ac399ade4a Document safari zone scripts 2019-10-20 09:53:21 -05:00
GriffinR
0db188b487 Clean up berry_tree.inc and misc adjacent documentation 2019-10-20 09:46:46 -05:00
DizzyEggg
4d407d22ba Fix merge 2019-10-19 15:52:21 +02:00
DizzyEggg
1d10d44a4d Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2019-10-19 15:17:45 +02:00
huderlem
cb9f89925f
Merge pull request #841 from GriffinRichards/document-gyms2 
Document Petalburg, Fortree, Mossdeep, and Sootopolis Gyms
 2019-10-19 08:05:11 -05:00
Sewef
19fb0fb220
Merge branch 'master' into patch-2 2019-10-16 19:35:33 +02:00
Sewef
ed1f5a7455 Conflits 3/2 
Nice one, git
 2019-10-16 19:32:02 +02:00
Sewef
c280d0e00e Another fix, Conflicts 2/2 2019-10-16 19:26:08 +02:00
Sewef
e7d36a76e1 Forgotten fix, conflits 1/2 2019-10-16 19:21:58 +02:00
Sewef
9dcfc5ba73 Fix labels 2019-10-16 19:10:39 +02:00
GriffinR
b4a9298205
Merge branch 'master' into document-gyms2 2019-10-16 04:22:34 -04:00
GriffinR
0f15264595 Document rotating_tile_puzzle 2019-10-16 04:09:30 -04:00
GriffinR
348bb002a8 Document Gym scripts first half 2019-10-15 17:09:47 -05:00
huderlem
a0b3f5d9e3
Merge pull request #833 from GriffinRichards/doc-inc2 
Document .incs split from event_scripts Round 2
 2019-10-15 16:30:27 -05:00
GriffinR
90a05cf824 Finish Mossdeep Gym doc, beging documenting rotating tile puzzle 2019-10-15 05:06:13 -04:00
GriffinR
1b41b8b7ca Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms 2019-10-15 05:05:57 -04:00
Sewef
07ac727c6d Document Oamdata in battle_anim (#838) 2019-10-14 18:26:47 -05:00
GriffinR
928cdf2531
Merge branch 'master' into doc-inc2 2019-10-14 19:25:10 -04:00
huderlem
26962b7725
Merge pull request #830 from GriffinRichards/doc-inc 
Document some .incs split from event_scripts
 2019-10-14 18:22:35 -05:00
garak
9b9b14ad0a remove empty groups from wild encounter fields json objects 2019-10-14 18:12:03 -05:00
garak
c73e20b6af add subgroups for fishing rods to encounter json 2019-10-14 18:12:03 -05:00
Sewef
8dacb53029 Update battle_anim_effects_1.c 2019-10-14 23:31:29 +02:00
Sewef
975c0ce1d0 Label battle_anim_effects_1 2019-10-14 23:27:12 +02:00
Sewef
65b82d67c9 Revert "More battle_anim_effects_1 labels" 
This reverts commit 00331a644a.
 2019-10-14 23:22:44 +02:00
Sewef
5a366e8d72 More battle_anim_effects_1 labels 2019-10-14 22:51:45 +02:00
Sewef
00331a644a More battle_anim_effects_1 labels 2019-10-14 22:42:15 +02:00
Sewef
299166edee Document subs & AnimTask in battle_anim_effects_1 2019-10-14 22:08:03 +02:00
Sewef
46f2cc5449 battle_anim_effects_1 main callbacks 2019-10-14 21:17:38 +02:00
Sewef
63b5be9259 Ended battle_anims_effects_1 SpriteTemplates 2019-10-14 21:05:40 +02:00
Sewef
ddd4639b82
Started labelling battle_anim_effects_1 2019-10-13 22:35:31 +02:00
GriffinR
30ef494163
Merge branch 'master' into doc-inc2 2019-10-13 15:44:07 -04:00
GriffinR
a081124a20
Merge branch 'master' into doc-inc 2019-10-13 15:26:44 -04:00
Marcus Huderle
8df4982b3f Merge remote-tracking branch 'upstream/master' into document-trade 2019-10-12 15:39:17 -05:00
GriffinR
4e2be7ff5e Review changes for #835 2019-10-12 15:14:57 -05:00
GriffinR
1b7607bd91 Document cable_club.inc 2019-10-12 15:14:57 -05:00
jiangzhengwenjz
9b81fe1b62 sub_810E520 2019-10-11 20:11:00 -05:00
GriffinR
3514f9dd6b Clean up trade.c doc 2019-10-10 18:46:42 -04:00
GriffinR
07fa82c911 Last non-anim trade.c doc 2019-10-10 03:50:51 -04:00
GriffinR
32aa87c7e1 More trade doc, fix switch indentations 2019-10-09 14:21:29 -04:00
GriffinR
2c062dc764 More trade documentation 2019-10-09 05:56:44 -04:00
GriffinR
d1bcd60b58 Document more trade.c 2019-10-08 20:25:46 -04:00
GriffinR
d8f5e73bb7
Merge branch 'master' into doc-inc 2019-10-07 17:37:04 -04:00
GriffinR
7ba11b7a1b Use VAR_FACING constants 2019-10-07 16:36:02 -05:00
GriffinR
9553ec1d28 Document mevent.inc 2019-10-07 10:34:12 -04:00
GriffinR
0df304d629 Document roulette.inc 2019-10-07 02:00:16 -04:00
GriffinR
81ee8f07ef Document pc.inc and prof_birch.inc 2019-10-07 01:13:34 -04:00
GriffinR
c4deb4db96 Document field_poison 2019-10-06 20:04:30 -04:00
GriffinR
f179ab95c0 Document move tutors 2019-10-06 17:30:17 -04:00
Marcus Huderle
4494b5d4cb Document collision types 2019-10-06 15:48:26 -05:00
Marcus Huderle
799edaf3e6 Document hide/show reflection movement actions 2019-10-06 14:17:34 -05:00
GriffinR
748a1dbdd4 Document cave hole 2019-10-06 14:16:37 -04:00
DizzyEggg
cb6bafcb7f Merge with master 2019-10-06 14:40:12 +02:00
GriffinR
66a68159b1 Continue trade doc 2019-10-05 10:41:37 -04:00
GriffinR
a6847ca1d9 Note overflow in ModifyStatByNature 2019-10-05 09:24:57 -05:00
GriffinR
dadb1cb9f1 More trade/union room doc, incidental party_menu doc 2019-10-04 23:31:25 -04:00
GriffinR
6b556900f8 Move union room data, more trade doc 2019-10-04 17:24:03 -04:00
GriffinR
2b0c944286 Document more of trade 2019-10-04 07:42:45 -04:00
GriffinR
4a7f061885 Document some of trade 2019-10-03 19:39:37 -04:00
GriffinR
c3c8fb40cf Move trade data, some trade.c clean up documentation 2019-10-03 01:16:22 -04:00
PikalaxALT
cb528cb543
Merge pull request #821 from GriffinRichards/document-textinput 
Document text input strings
 2019-10-02 09:49:26 -04:00
PikalaxALT
0d13a85855
Merge pull request #822 from GriffinRichards/document-fieldspecials 
Document a few field specials
 2019-10-02 09:22:09 -04:00
PikalaxALT
9317d114a9
Merge pull request #823 from GriffinRichards/constants-strconv 
Use STR_CONV constants
 2019-10-02 09:18:48 -04:00
GriffinR
c5cb45991b Document PrintItemXAmount 2019-09-30 15:53:24 -04:00
GriffinR
5325835ee7 Use STR_CONV constants 2019-09-30 15:43:44 -04:00
GriffinR
9aed405851 Document a few field specials 2019-09-30 01:42:52 -04:00
GriffinR
a923ae78c3 Add missing page num usage 2019-09-30 00:13:08 -04:00
GriffinR
53bc1bd0d1 Document text input strings 2019-09-30 00:09:29 -04:00
Tustin2121
5007d279fe Review fixes 2019-09-29 16:33:13 -04:00
GriffinR
73b96fe145 Rename CONTACT macros to ON_DAMAGE 2019-09-27 12:27:36 -04:00
PikalaxALT
301822603e
Merge pull request #802 from PikalaxALT/gflib 
Gflib and libagbsyscall
 2019-09-27 11:34:55 -04:00
PikalaxALT
7b8b5b5c8c Merge branch 'master' into gflib 2019-09-27 09:11:22 -04:00
GriffinR
3bf8129396 Clean up new Cmd macro names 2019-09-27 02:54:28 -04:00
GriffinR
1491b1855b
Merge branch 'master' into document-eventscripts 2019-09-26 15:03:22 -04:00
GriffinR
1016b23918
Merge branch 'master' into rename-tablecmds 2019-09-26 15:02:38 -04:00
Ariel Antonitis
208e1c9689 Removed 'Summary_' prefix. 2019-09-25 20:44:17 -05:00
Ariel Antonitis
ea638b82fa Fixed typo. 2019-09-25 20:44:17 -05:00
Ariel Antonitis
4b7f096bbd Relabeled unknown functions in pokemon_summary_screen.c 2019-09-25 20:44:17 -05:00
GriffinR
37373c1b21 Review changes for #817 2019-09-25 18:46:25 -05:00
GriffinR
4e98a0cc4b Remove Egg parent constants 2019-09-25 18:46:25 -05:00
GriffinR
801ca37f04 Document day_care.inc and related 2019-09-25 18:46:25 -05:00
Marcus Huderle
1ae352bcb6 Cleanup whitespace 2019-09-25 16:45:57 -05:00
jiangzhengwenjz
405384de89 Phase2_Ripple_Func2 2019-09-25 16:45:57 -05:00
jiangzhengwenjz
9aaf498471 CopyTileMapEntry 2019-09-25 16:37:42 -05:00
huderlem
886f043025
Merge pull request #816 from jiangzhengwenjz/ptch-3 
get rid of goto in battle_script_commands
 2019-09-25 16:31:53 -05:00
GriffinR
de6e1e9ecf Use multi constants from merge 2019-09-23 00:36:49 -04:00
GriffinR
a180d2af49
Merge branch 'master' into document-eventscripts 2019-09-22 12:18:48 -04:00
GriffinR
8e4e344c7d
Merge branch 'master' into document-scriptmenu 2019-09-22 09:45:44 -04:00
GriffinR
80f58f7b24 Document PLAYER_HAS constants, consolidate poke constants 2019-09-22 08:14:22 -05:00
GriffinR
b6dffcf8b7 Clean up script_menu documentation 2019-09-19 19:23:24 -04:00
GriffinR
9fb24bbbce Remainder of script_menu documentation 2019-09-19 18:31:09 -04:00
GriffinR
275695c189 Document more script_menu, lilycove harbor 2019-09-19 17:27:34 -04:00
GriffinR
de0084ef7a Document multichoice ids 2019-09-19 00:56:51 -04:00
GriffinR
b596322ca2 Initial script_menu documentation 2019-09-18 18:57:25 -04:00
GriffinR
58b8d7c297
Merge branch 'master' into document-eventscripts 2019-09-17 18:01:20 -04:00
GriffinR
459fca289c Review changes for #806 2019-09-17 16:50:42 -05:00
GriffinR
5092ad376d Dynamic ordering for options names 2019-09-17 16:50:42 -05:00
GriffinR
1be131f843 Dynamic ordering for options menu 2019-09-17 16:50:42 -05:00
GriffinR
6ab192e739 Review changes for #807 2019-09-17 16:50:17 -05:00
GriffinR
6ab49da811 Clean up field_specials documentation 2019-09-17 16:50:17 -05:00
GriffinR
3dbd375779 Some frontier field_specials documentation 2019-09-17 16:50:17 -05:00
GriffinR
aac9658a8e Document some field_specials data 2019-09-17 16:50:17 -05:00
GriffinR
945d3d3a27
Merge branch 'master' into document-eventscripts 2019-09-17 00:10:23 -04:00
GriffinR
06af24bce5 Use misc ScrCmd constants 2019-09-16 19:44:47 -05:00
GriffinR
340c4e1411 Clean up script_movement documentation 2019-09-16 19:30:36 -05:00
GriffinR
f9a8f44a29 Document script_movement 2019-09-16 19:30:36 -05:00
GriffinR
6c9997a906 Document decor icons 2019-09-16 19:23:21 -05:00
GriffinR
b46c4b6703 more constant usage 2019-09-16 19:21:23 -05:00
GriffinR
85d97542cd Use MAX_MON_MOVES constants 2019-09-16 19:21:23 -05:00
LOuroboros
c6504ebfd4 Oops. I forgot to set the correct description in the Dream Ball's data. 2019-09-16 18:43:51 -03:00
LOuroboros
22e1e53d66 Added missing item data. 2019-09-16 18:04:01 -03:00
GriffinR
f4160ded98 Fix misnamed function 2019-09-16 00:29:59 -04:00
GriffinR
bb236b490d Update BS constants for Cmd rename 2019-09-15 17:58:12 -04:00
tustin2121
711e7d884c Document cave transition code. 2019-09-10 13:43:33 -04:00
PikalaxALT
27aae9da9a Fix modern 2019-09-08 21:41:40 -04:00
PikalaxALT
306ce048ad Move gflib srcs and headers to gflib subdir 2019-09-08 21:07:54 -04:00
GriffinR
9fbcd552de document remainder of secret_base scripts, delete unneeded scripts.incs 2019-09-06 02:12:00 -04:00
PikalaxALT
e87f4f4cc7 Unify TrHillTag struct definitions (variable floors) 2019-09-05 20:48:48 -05:00
PikalaxALT
904bba9e16 NULL_BATTLE_TOWER_POKEMON define 2019-09-05 20:48:48 -05:00
PikalaxALT
e2fbce996e Use designated initializers (C99 feat) 2019-09-05 20:48:48 -05:00
PikalaxALT
f3bed6045e Disassemble data/ereader_screen.s 2019-09-05 20:48:48 -05:00
PikalaxALT
a9918c3b89 Partial refactor of TryWriteTrainerHill_r 2019-09-05 20:48:48 -05:00
PikalaxALT
cb0fa2fdc3 Minor edit to save trainer hill routine 2019-09-05 20:48:48 -05:00
PikalaxALT
b510100503 Port trainer hill sets to C objects 2019-09-05 20:48:48 -05:00
PikalaxALT
8d910465f8 Minor refactor of ereader_helpers.c 2019-09-05 20:48:48 -05:00
Eduardo Quezada D'Ottone
de02805388 Changed names. 2019-09-05 20:42:15 -05:00
Eduardo Quezada D'Ottone
e2689d2a27 Documented Mechadoll answers. 2019-09-05 20:42:15 -05:00