GriffinR
c86cc8b371
Document intro, start intro_credits/credits
2021-03-28 23:13:56 -04:00
Scott
5cb8ec4247
Rename IsNotEventLegalMewOrDeoxys
2021-03-27 17:27:32 -05:00
GriffinR
7a5c6d4d86
Standardize Friendship/Happiness
2021-03-27 17:27:20 -05:00
ultima-soul
56a1cab314
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-03-23 15:21:19 -07:00
GriffinR
0f869fb266
Remaining labels in trainer_card
2021-03-22 15:30:19 -05:00
GriffinR
2be0c52c17
Remaining labels in map_name_popup
2021-03-22 15:30:19 -05:00
GriffinR
1cc0a3506f
Label misc field effects
2021-03-22 15:30:19 -05:00
GriffinR
4077c53338
A few labels in party, start, option menus
2021-03-22 15:30:19 -05:00
GriffinR
9773b436d2
Clean up shop.c
2021-03-22 15:30:19 -05:00
GriffinR
6127c6f32e
Misc labels in battle facilities
2021-03-22 15:30:19 -05:00
Kurausukun
9eb5794482
cleanup some m4a code (thanks to shoomer)
2021-03-21 13:43:53 -05:00
GriffinR
dfc6ee0e9e
Add SAFE_DIV
2021-03-21 13:43:14 -05:00
GriffinR
28aff5b179
Correct ClearRankingHallRecords bugfix
2021-03-21 13:43:14 -05:00
GriffinR
557152b06e
Minor link cleanup
2021-03-21 13:40:40 -05:00
Kurausukun
7198d40ec8
port some documentation from FR
2021-03-19 18:49:19 -04:00
Kurausukun
5b910a11b4
port miscellaneous fr documentation
2021-03-18 20:35:39 -04:00
GriffinR
8eafe1fd4e
Move pointillism points array to src
2021-03-18 17:36:18 -05:00
GriffinR
22e2c0a47c
Document Berry Crush
2021-03-18 15:18:23 -04:00
LOuroboros
dea69a48ef
Decapped nature names
2021-03-18 08:31:38 -03:00
Kurausukun
3baac6ef3c
port some missed berry crush documentation
2021-03-15 23:55:10 -04:00
GriffinR
ecd269ba2c
Merge pull request #1372 from GriffinRichards/doc-countdown
...
Document minigame countdown
2021-03-15 21:39:58 -04:00
PikalaxALT
925e68c03f
Update newly named fields
2021-03-15 15:22:41 -04:00
PikalaxALT
8352ebcc48
Merge branch 'master' of github.com:pret/pokeemerald into battle_multi_buffer
2021-03-15 09:46:57 -04:00
Blackforest92
badf8945d8
Added missing gen8 battle sprites and available icons - Fix Arceus, Palkia, Kyurem White and Black - Implement 1 tile 10 palettes system for Alcremie
2021-03-14 18:31:24 +07:00
Seth Barberee
4158f07dee
move bgBuffers back to unk138
2021-03-12 19:24:03 -06:00
Seth Barberee
fda56d6f47
berry_crush: sync some pokefirered names with pokeemerald
2021-03-12 18:39:25 -06:00
PikalaxALT
8d4dcb228a
More documentation in battle_main
2021-03-12 16:55:58 -05:00
PikalaxALT
e32a1571af
Resolve link comm buffers in gBattleStruct
2021-03-12 15:37:31 -05:00
PikalaxALT
e6b1b97aa1
Nonmatching resoltuion
...
- Fix fakematch in Cmd_get_used_held_item
- Remove `static` overrides in MODERN in four objects
2021-03-12 13:55:07 -05:00
GriffinR
b1a69d95ea
Document minigame countdown
2021-03-11 14:25:22 -05:00
GriffinR
6c297d19e8
Merge pull request #1356 from GriffinRichards/doc-dodrioberrypicking
...
Document Dodrio Berry Picking
2021-03-10 18:55:41 -05:00
ExpoSeed
c0040b5ce5
Form change on daycare withdraw
2021-03-09 12:20:13 -06:00
ExpoSeed
3655fe52f3
Prison Bottle and Reveal Glass don't exist yet
2021-03-09 11:54:56 -06:00
ExpoSeed
f8dfd8f353
Remove special casing
2021-03-09 11:53:01 -06:00
GriffinR
6274acfe5f
Fix out of bounds access for fighting anims
2021-03-08 14:32:20 -05:00
N
94a883d600
Fix space
2021-03-04 19:36:44 -06:00
N
99c6a504e0
Finish renaming functions
2021-03-04 19:36:44 -06:00
N
b9b33b6f2b
Some renaming
2021-03-04 19:36:44 -06:00
N
7b046ebd1d
rename gBerryCrushGame
2021-03-04 19:36:44 -06:00
N
d5a63681e8
Fixed faulty define
2021-03-04 19:33:40 -06:00
N
d63431ae88
Fix comment
2021-03-04 19:33:40 -06:00
N
a2f757c7a6
Document BG_PLTT usage in Agb_Main
2021-03-04 19:33:40 -06:00
Kurausukun
204e95dfea
remove unnecessary changes
2021-03-04 19:32:16 -06:00
Kurausukun
dec5e8eee5
steal matching from #1333
2021-03-04 19:32:16 -06:00
GriffinR
55a40b901f
Label battle tower link script
2021-03-04 19:30:19 -06:00
GriffinR
734a15135f
Clean up a few unlabeled scripts
2021-03-04 19:30:19 -06:00
ExpoSeed
dd73d8fc06
Fix wrong comment
2021-03-03 16:47:31 -06:00
ExpoSeed
f49da96f1d
Fix consumable item form change
2021-03-03 15:24:58 -06:00
ExpoSeed
07af84db8a
Implement FORM_ITEM_USE. Credits to Lunos for work on Gracidea
2021-03-03 13:54:25 -06:00
GriffinR
69f7882b5e
Label missed pokemon jump anims
2021-03-03 14:32:09 -05:00
GriffinR
b9c733495b
Document dodrio berry picking
2021-03-03 14:26:05 -05:00
ExpoSeed
6f64c1b2b9
Implement GetFormChangeTargetSpecies
2021-03-03 13:07:50 -06:00
ExpoSeed
aac7028703
Add newline at end of file
2021-03-02 14:21:29 -06:00
ExpoSeed
6db5a98ad9
Delete old form change table
2021-03-02 14:20:39 -06:00
ExpoSeed
ec1a09bcd5
Revamp table
2021-03-02 14:18:34 -06:00
ExpoSeed
7802264732
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table
2021-03-01 19:38:13 -06:00
GriffinR
91ab30fa71
Rename mon markings struct
2021-02-28 17:11:46 -06:00
GriffinR
ed0347476c
Remove old declaration and define
2021-02-28 17:11:46 -06:00
GriffinR
031da44cab
Document mon markings
2021-02-28 17:11:46 -06:00
GriffinR
8bfd1370c9
Merge pull request #1352 from huderlem/GetOpponentMostCommonMonType
...
Document GetOpponentMostCommonMonType and fix its fake matching
2021-02-28 17:27:39 -05:00
Marcus Huderle
200e8214cf
Document GetOpponentMostCommonMonType and fix its fake matching
2021-02-28 10:43:56 -06:00
GriffinR
cbc7a72814
Merge pull request #1346 from GriffinRichards/doc-pokejump
...
Document pokemon jump
2021-02-28 11:19:02 -05:00
N
6c07031c85
Remove redundant statements
2021-02-28 10:06:07 -06:00
N
cab3728e96
Strangest match
2021-02-28 10:06:07 -06:00
huderlem
10c77f1bc2
Merge pull request #1345 from GriffinRichards/doc-rtcscreen
...
Document/clean up some minor screens
2021-02-28 10:03:22 -06:00
Marcus Huderle
c900de35e7
Fix build and cleanup mistakes
2021-02-28 09:54:55 -06:00
Marcus Huderle
a85fada314
Document more battle anim effects
2021-02-28 09:54:55 -06:00
GriffinR
1912b0cf0a
Merge branch 'master' into doc-rtcscreen
2021-02-28 10:28:43 -05:00
GriffinR
3f59362397
Merge branch 'master' into doc-pokejump
2021-02-28 10:27:50 -05:00
GriffinR
ea748ff7f5
Merge pull request #1344 from GriffinRichards/doc-ec
...
Document easy chat and mail, script.c cleanup, add/use some general constants
2021-02-28 10:26:49 -05:00
Marcus Huderle
c323e7f061
Document some battle anim funcs and data
2021-02-27 11:04:45 -06:00
GriffinR
763724a980
Shifts to mult in ShowBonus
2021-02-26 21:13:16 -05:00
GriffinR
117b90a261
Document pokemon jump
2021-02-26 17:26:39 -05:00
GriffinR
2dfa84c10f
Clean up berry_fix_program
2021-02-24 16:46:57 -05:00
GriffinR
f172ff84c9
Clean up save_failed_screen
2021-02-24 14:53:32 -05:00
GriffinR
f09278393e
Document reset_rtc_screen
2021-02-24 14:29:33 -05:00
GriffinR
293df1887f
Fix comment typo
2021-02-24 11:26:26 -05:00
GriffinR
b71b10623b
Add palette selection constants
2021-02-24 11:03:51 -05:00
GriffinR
c6141fea83
Document easy chat
2021-02-24 11:03:45 -05:00
GriffinR
1cac608dbe
Document mail
2021-02-24 11:03:39 -05:00
GriffinR
b04f0aaa2b
Use SPRITE_NONE constant
2021-02-24 11:03:32 -05:00
GriffinR
a5852d57d1
Use TASK_NONE constant
2021-02-24 11:03:25 -05:00
GriffinR
e52b46ab43
Clean up script.c
2021-02-24 11:03:17 -05:00
GriffinR
81a7f491b7
Use WINDOW_NONE constant
2021-02-24 11:03:08 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons
...
Document some ribbon usage
2021-02-24 10:07:59 -05:00
amiosi
d7d8c62753
restore and add noFlip values
...
sources: vanilla emerald, pokediamond, hgss/bw2 overworlds, oras/usum menu sprites.
missing: bw2 & oras data
2021-02-22 16:04:55 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem
...
Document PokemonUseItemEffects
2021-02-22 12:15:19 -05:00
GriffinR
65433c790e
Merge pull request #1342 from sphericalice/heart-icon-palette-tag-constant
...
Use the field effects palette tag constant for the heart icon
2021-02-22 10:43:55 -05:00
SphericalIce
2d7b25428a
Use the field effects palette tag constant for the heart icon
2021-02-22 15:35:09 +00:00
SphericalIce
381116b3c4
Add labels for cracked floor metatiles
2021-02-22 15:29:14 +00:00
Sahith Nallapareddy
dafca0ba22
changing to use constants
2021-02-21 19:27:59 -05:00
HornedCrusader
84cb04fa38
Fix bike flag
2021-02-20 11:52:41 -05:00
GriffinR
64fc585cc3
Document pokenav ribbons summary screen
2021-02-18 11:33:55 -05:00
GriffinR
02c1fbd733
Document ribbon TV show, add new ribbon IDs/size
2021-02-18 09:59:24 -05:00
GriffinR
642ae8295e
Some constant use in pokemon_icon.c
2021-02-17 14:11:59 -05:00
GriffinR
e059c4fdfa
Use new gift ribbons size, label unused ribbons
2021-02-17 14:11:45 -05:00
GriffinR
2e355ac848
Merge pull request #1329 from Kurausukun/fakematches
...
[LEAK-INFORMED] Resolve Fakematches
2021-02-15 23:59:55 -05:00
GriffinR
ee4af94a36
Merge pull request #1324 from GriffinRichards/doc-sb
...
Document remainder of secret_base.c
2021-02-15 17:41:55 -05:00
Deokishisu
d418321627
Update crt0.s
2021-02-15 17:25:36 -05:00
Deokishisu
7b2bf8c7e2
Rename obedient/fatefulEncounter to eventLegal
...
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.
Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e
Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
...
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.
The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
2021-02-15 11:40:16 -05:00
GriffinR
5f58ea02c6
Merge pull request #1330 from sphericalice/hidden-to-buried
...
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 21:48:21 -05:00
SphericalIce
27dc32de26
Use RGB macros
2021-02-14 22:08:19 +00:00
SphericalIce
70ff6c3b84
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 19:25:23 +00:00
GriffinR
be0699bd64
Merge pull request #1326 from GriffinRichards/doc-layouts
...
Label unused layouts
2021-02-14 14:22:28 -05:00
GriffinR
a85ac11b28
Merge pull request #1325 from GriffinRichards/constants-berrytree
...
Add berry tree id constants
2021-02-14 14:15:51 -05:00
Kurausukun
10e430ae15
oops
2021-02-14 04:03:53 -05:00
Kurausukun
7c4116b32a
fix indentation
2021-02-14 04:01:20 -05:00
Kurausukun
6b5db889dd
[LEAK-INFORMED] remove fakematching comment
...
it is in fact not a fakematch
2021-02-14 03:57:50 -05:00
Kurausukun
bf062f5547
[LEAK-INFORMED] fix battle dome fakematching
...
yes they actually fucking did this
2021-02-14 03:51:38 -05:00
GriffinR
8634710996
Document PokemonUseItemEffects
2021-02-12 16:02:04 -05:00
LOuroboros
21ee6cb9fb
Added constant labels for EV manipulating item effects
2021-02-12 07:26:11 -03:00
GriffinR
987fdf6fcd
Merge pull request #1321 from GriffinRichards/doc-evoscene
...
Document evolution scene
2021-02-08 18:21:30 -05:00
GriffinR
487e04d269
Merge pull request #1319 from GriffinRichards/crt0comm
...
Add comments for some data in crt0.s
2021-02-08 17:15:52 -05:00
GriffinR
2237d0748f
Label unused layouts
2021-02-08 14:45:56 -05:00
GriffinR
6899acfb6f
Merge pull request #1317 from opakedragon/master
...
Fix Spelling of BagMenu_RemoveBagItemMessageindow
2021-02-07 13:43:05 -05:00
GriffinR
0851c34bac
Add berry tree id constants
2021-02-05 15:25:12 -05:00
GriffinR
2e57a00d17
Use GAME_LANGUAGE instead of LANGUAGE_ENGLISH
2021-02-05 12:08:49 -05:00
GriffinR
a240481d5f
Document secret_base.c
2021-02-05 12:08:25 -05:00
GriffinR
2b5f7fe151
Merge pull request #1323 from LOuroboros/newCursorArea
...
newCurosrArea -> newCursorArea
2021-02-05 07:16:38 -05:00
LOuroboros
2e51a69400
newCurosrArea -> newCursorArea
2021-02-05 04:59:26 -03:00
Deokishisu
ac43365d58
Fix "Compatibility" Misspelling
...
Someone misspelled "compatibility" as "compatability" in the daycare-related files. This commit spells them correctly.
2021-02-05 01:27:11 -05:00
GriffinR
15906ca143
Document evolution scene
2021-02-03 17:55:37 -05:00
amiosi
11e6298a05
tmhm and tutor spacing
2021-02-03 15:08:53 -05:00
amiosi
762dcb8a7c
cry fixes, type null
2021-02-03 14:10:39 -05:00
amiosi
b84f952f32
mistaken MrRime change
2021-02-03 13:09:09 -05:00
amiosi
663cc5b15c
oricorio...
2021-02-03 13:02:13 -05:00
amiosi
418da6158b
last of the cries
2021-02-03 12:57:56 -05:00
amiosi
e62f53b13e
fix spacing i missed on tutors and expand to all species
...
plus reorder kyurem forms to match the rest of the repo
2021-02-02 15:18:45 -05:00
amiosi
0798ba22a6
fix tmhm spacing i missed, extend to all species
2021-02-02 15:10:45 -05:00
amiosi
a021204389
oricorio pau constants
2021-02-02 14:49:01 -05:00
amiosi
032f8ac834
tapus pls
2021-02-02 14:43:12 -05:00
amiosi
248e0b50d7
Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr
2021-02-02 14:24:36 -05:00
amiosi
9c2c337e6f
tapu case
2021-02-02 14:24:15 -05:00
amiosi
f700004188
proper CamelCase
2021-02-02 14:21:00 -05:00
amiosi
dba1383d55
Merge remote-tracking branch 'upstream/pokemon_expansion' into dex-decap
2021-02-02 13:33:06 -05:00
amiosi
42ea6f482b
more dex entry spacing
2021-02-02 13:32:55 -05:00
amiosi
2d6b80455d
Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr
2021-02-02 13:25:53 -05:00
amiosi
47e1d6b790
MIMEJR -> MIME_JR
2021-02-02 12:36:05 -05:00
ExpoSeed
f93bd60c93
Merge pull request #1371 from LOuroboros/keldeo_resolute
...
Fixed Keldeo Resolute's animation
2021-02-02 11:18:23 -06:00
ExpoSeed
2d1384e88f
Merge pull request #1370 from LOuroboros/deoxys
...
Fixed Deoxys Attack Form's animation
2021-02-02 11:17:25 -06:00
ghoulslash
47f89de53b
Merge pull request #1384 from ultima-soul/pokemon_expansion_sync
...
Pokemon Expansion Upstream Sync
2021-02-02 09:48:21 -07:00
GriffinR
64460e01ae
Merge pull request #1314 from GriffinRichards/doc-controllers
...
Document battle controllers, misc other battle
2021-02-02 00:24:16 -05:00
GriffinR
7e26aa3d21
Merge pull request #1316 from GriffinRichards/doc-scrcmd
...
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
2021-02-01 21:04:00 -05:00
amiosi
940ca8dc19
category decap and length
2021-02-01 15:25:53 -05:00
GriffinR
90513a9d72
Merge pull request #1318 from GriffinRichards/bardmoves
...
Minor bard music clean up
2021-02-01 14:59:45 -05:00
amiosi
102285d464
mons/moves
2021-02-01 14:37:48 -05:00
amiosi
35f3cdd2f2
decap POKeMON string
2021-02-01 14:19:24 -05:00
GriffinR
45ee3a687d
Add comments for some data in crt0.s
2021-01-29 18:36:39 -05:00
amiosi
fe3419fa21
Update level_up_learnsets.h
2021-01-29 15:51:53 -05:00
opakedragon
1e8edcbfcd
Revert "Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow""
...
This reverts commit be50fab8f2
2021-01-29 13:36:24 -05:00
opakedragon
be50fab8f2
Revert "Fix Spelling of BagMenu_RemoveBagItemMessageindow"
...
This reverts commit 3a6be5a34c
2021-01-29 13:30:09 -05:00
ultima-soul
96232ea166
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-01-28 23:59:08 -08:00
GriffinR
12af03cd62
Label bard music pitch table
2021-01-28 16:36:56 -05:00
GriffinR
89b85a49ec
Index gBardSounds_Moves and gBardSounds_Pokemon with constants
2021-01-28 15:55:33 -05:00
ExpoSeed
34c6771e94
Create form change table
2021-01-27 16:30:43 -06:00
LOuroboros
6e89f8dff2
Corrected Riolu's evo method
2021-01-27 19:02:37 -03:00
LOuroboros
cfa6fc5eb8
Fixed Keldeo Resolute's animation
2021-01-27 15:26:39 -03:00
LOuroboros
99c7797dc8
Fixed Deoxys Attack Form's animation
2021-01-27 15:06:49 -03:00
opakedragon
3a6be5a34c
Fix Spelling of BagMenu_RemoveBagItemMessageindow
2021-01-27 06:18:29 -05:00
luckytyphlosion
b0de03356b
Merge pull request #1315 from PokeCodec/patch-3
...
Use INTR_FLAG_VBLANK instead of constant 0x1
2021-01-26 15:22:24 -05:00
luckytyphlosion
ff8952a3f0
Merge pull request #1308 from PokeCodec/pain
...
Get rid of Task_data_OP macro
2021-01-26 15:22:13 -05:00
GriffinR
92bd6400b7
Fix up berry sparkle
2021-01-26 05:40:34 -05:00
GriffinR
9e59581220
Document object lock and some trainer approach
2021-01-26 04:42:18 -05:00
GriffinR
0064333e4a
Clean up scrcmd.c
2021-01-26 02:16:26 -05:00
N
b1a29e5017
Use INTR_FLAG_VBLANK instead of constant 0x1
2021-01-25 21:37:04 -05:00
GriffinR
3fd5e143a9
Misc battle anim documentation
2021-01-23 00:40:46 -05:00
GriffinR
a392cca928
Misc battle documentation
2021-01-23 00:40:31 -05:00
GriffinR
4228509e95
Sync link opponent controller doc to opponent
2021-01-22 21:47:00 -05:00
GriffinR
6f71569fbd
Sync recorded opponent controller doc to opponent
2021-01-22 21:41:49 -05:00
GriffinR
c106f7f130
Document battle_controller_opponent.c
2021-01-22 21:35:16 -05:00
GriffinR
d1878f933b
Sync link partner controller doc to player
2021-01-22 20:49:14 -05:00
GriffinR
74990a5a76
Sync player partner controller doc to player
2021-01-22 20:48:43 -05:00
GriffinR
1042426cc6
Sync recorded player controller doc to player
2021-01-22 20:47:59 -05:00
GriffinR
b9baf9437d
Sync safari/wally controller doc to player
2021-01-22 20:13:34 -05:00
GriffinR
63a7828772
Document battle_controller_player.c
2021-01-22 20:03:27 -05:00
N
07d19ba526
Update main.c
2021-01-22 18:40:08 -05:00
N
3102d94e3c
Undo change
2021-01-22 17:41:57 -05:00
N
c636b7c3ae
Some more tweaks
2021-01-22 17:41:07 -05:00
GriffinR
4eca05ccf5
Document remainder of battle_controllers.c
2021-01-22 02:48:22 -05:00
ExpoSeed
2e0b02e491
Merge pull request #1322 from amiosi/pokemon_expansion
...
Dex colors, mawile footprint, hoopa friendship, koffing abilities, config fix
2021-01-21 19:16:59 -06:00
amiosi
08eb883939
sounds like a lot of HOOPA
2021-01-21 20:10:38 -05:00
ghoulslash
32cc04c91c
Merge pull request #1311 from ultima-soul/deoxys_handling_removal
...
Remove Special Handling for Deoxys
2021-01-21 12:22:03 -07:00
ghoulslash
fe7f2f18a4
Merge pull request #1328 from ultima-soul/add_fairy_frlg_icon_pe
...
Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank
2021-01-21 12:19:41 -07:00
GriffinR
8fe4d004e3
Merge pull request #1305 from GriffinRichards/doc-battletv
...
Document battle tv data
2021-01-21 12:27:14 -05:00
GriffinR
3ceb43177d
Merge pull request #1312 from sphericalice/pokeemerald
...
Fix misnamed ground effect flags & document reflections
2021-01-20 18:50:31 -05:00
SphericalIce
c0489199c0
Rename GetObjEventReflectionType & fix fakematch in GetGroundEffectFlags_Reflection
2021-01-20 22:32:04 +00:00
ghoulslash
b4b1d2b9e2
Merge pull request #1315 from ultima-soul/form_species_tables_pe
...
Add Form Species ID Tables
2021-01-20 13:54:20 -07:00
ultima-soul
fdc6156f83
Add Form Species ID tables and entries for new mons and forms.
2021-01-20 12:07:29 -08:00
ultima-soul
9663ed0d3c
Merge branch 'form_species_tables' into form_species_tables_pe
2021-01-20 12:06:59 -08:00
ultima-soul
267900bdcb
Add Form Species ID tables and functions to access them.
2021-01-20 11:31:20 -08:00
SphericalIce
86297398e6
Move the definition of RETURN_REFLECTION_TYPE_AT and make use of REFL_TYPE_NONE
2021-01-20 10:34:33 +00:00
SphericalIce
4334f7a379
Include NUM_REFLECTION_TYPES in the ReflectionTypes enum
2021-01-20 10:17:07 +00:00
GriffinR
18b8e0ee8e
Merge pull request #1311 from GriffinRichards/clean-unused
...
Remove unused local variables and functions
2021-01-19 23:22:44 -05:00
GriffinR
6999b237eb
Merge pull request #1309 from GriffinRichards/misc-macro
...
Use constants for item data, misc other constants/fixes
2021-01-19 20:49:58 -05:00
ultima-soul
feecb8b923
Merge pull request #1331 from amiosi/alola
...
fix alolan form movesets
2021-01-19 17:07:03 -08:00
amiosi
be1390e7ae
renames
2021-01-19 20:03:35 -05:00
SphericalIce
2746fd1f95
Name object event ID arguments properly
2021-01-19 23:35:57 +00:00
SphericalIce
6dd973012b
Correct ground effect flag names for reflections & document sprite data usage
2021-01-19 23:21:50 +00:00
GriffinR
b65980cd4e
Remove unused local variables and functions
2021-01-19 18:19:33 -05:00
N
e5e390d64b
Revert zero initialization
2021-01-19 14:33:11 -05:00
N
d720520de8
Clarified comment again
2021-01-19 13:47:09 -05:00
N
b6c483394e
Clarified comments
...
Made comments clearer.
2021-01-19 13:43:57 -05:00
GriffinR
752982552e
Add FIRST_BALL, some FIRST_BERRY_INDEX usage
2021-01-19 13:39:18 -05:00
SphericalIce
2dfaba9472
Name color return values more accurately
2021-01-19 17:59:36 +00:00
SphericalIce
8de76ed533
Make broader use of RGB macros
2021-01-19 17:15:12 +00:00
GriffinR
cf9f8d01c5
Add misc item data constants
2021-01-19 05:49:20 -05:00
GriffinR
4e845b6395
Use constants for contestLinkResults
2021-01-19 04:40:06 -05:00
GriffinR
3f36529cba
Use NUMBER_OF_MON_TYPES in pokedex search
2021-01-19 04:34:50 -05:00
GriffinR
9dd867689e
Use ARRAY_COUNT in PrintMenuTable
2021-01-19 04:19:14 -05:00
GriffinR
3f9037d63a
Use ARRAY_COUNT in InitBgsFromTemplates
2021-01-19 04:14:07 -05:00
GriffinR
bc20fda604
Use GET_UNOWN_LETTER macro
2021-01-19 04:03:16 -05:00
N
7134763b73
Update task.c
2021-01-17 13:00:53 -05:00
N
8297090267
Update task.c
2021-01-17 12:49:50 -05:00
N
ad6ab09e30
Update comment
2021-01-17 12:46:08 -05:00
N
3b80f3caf1
Make variable name shorter
2021-01-17 12:44:08 -05:00
N
d3259ebe2c
renamed taskNum to followupFuncDataIndex
2021-01-16 21:56:49 -05:00
N
72e8683975
FIxed the comments
2021-01-16 21:50:59 -05:00
N
e7436ab4c8
Update task.c
2021-01-16 21:35:40 -05:00
N
0159c0c1ae
Update task.c
2021-01-16 21:09:51 -05:00
N
a950167d89
Remove define
2021-01-16 21:05:35 -05:00
N
6b5ce647df
Update task.c
2021-01-16 20:31:09 -05:00
N
26246ce281
Update task.c
2021-01-16 20:29:42 -05:00
N
926ef40c52
Get rid of Task_data_OP macro
...
This macro is so annoying. Can we please do away with it?
2021-01-16 20:19:00 -05:00
GriffinR
564278fd49
Document battle tv data
2021-01-14 06:29:59 -05:00
GriffinR
8e06d5679c
Index gBardSoundsTable
2021-01-14 03:54:59 -05:00
GriffinR
46e0a0607d
Array count for easy chat word groups
2021-01-14 03:48:49 -05:00
GriffinR
f63bc6e27a
Index sTMHMMoves
2021-01-14 03:41:28 -05:00
GriffinR
b9e1b050e1
Label remaining battle types
2021-01-13 15:20:29 -05:00
ultima-soul
9c5ec33aa7
Sync Crown Tundra and renamed moves Battle Engine defines.
2021-01-12 14:22:33 -08:00
ultima-soul
3cb09b6507
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal
2021-01-11 15:19:11 -08:00
Philipp AUER
b5fa0129d5
[pokemon-expansion] Changes as requested by code review
...
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update src/data/pokemon/evolution.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update src/data/pokemon/evolution.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update src/data/pokemon/evolution.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-01-11 21:43:00 +01:00
GriffinR
fa3acd79e7
Fix missing header for sub_817F77C BUGFIX
2021-01-11 10:37:22 -05:00
GriffinR
4a7a3df205
Move SeedRngWithRtc fix to BUGFIX conditional
2021-01-11 10:36:53 -05:00
GriffinR
a733b211a3
Merge pull request #1297 from SatoMew/master
...
Document the unused battle strings for downpour weather
2021-01-11 10:01:57 -05:00
opakedragon
295ec313f5
rename string id/variable to reflect usage
2021-01-11 08:49:31 -05:00
SatoMew
ead437e89b
Document the unused battle strings for downpour weather
2021-01-10 22:26:00 +00:00
GriffinR
e6aebc16da
Merge pull request #1296 from GriffinRichards/bugfix-typo
...
Add missing braces to bugfix in CalculateMonStats
2021-01-10 12:34:39 -05:00
sbird
95665c24b4
[pokemon_expansion] define missing items from ITEM_EXPANSION for gEvolutionTable
2021-01-10 18:30:15 +01:00
GriffinR
8afc28c98f
Add missing braces to bugfix in CalculateMonStats
2021-01-10 12:24:59 -05:00
ultima-soul
767f26b73c
Corrected defines for Item Expansion-introduced items for Gen 8 species data.
2021-01-08 19:06:20 -08:00
SphericalIce
f02afc134b
Use the correct constant for max-IV masks
2021-01-07 22:34:57 +00:00
SphericalIce
3c2a33b9b2
Use constants for max IVs & the random IV generation flag
2021-01-07 22:13:14 +00:00
SphericalIce
fb69d97b24
Use the constant for the max total of EVs
2021-01-07 21:11:45 +00:00
GriffinR
c506cf747f
Merge pull request #1293 from GriffinRichards/typo-pyramind
...
Fix sPyramindFloorNames typo
2021-01-05 00:16:24 -05:00
GriffinR
fe5269b875
Fix sPyramindFloorNames typo
2021-01-04 23:58:33 -05:00
amiosi
25e7f36ce9
fix reversed names
2021-01-04 22:12:03 -05:00
amiosi
c83c09fc3a
tabs -> spaces
2021-01-04 22:09:09 -05:00
amiosi
24be2c8c39
fix alolan form movesets
2021-01-04 22:04:51 -05:00
GriffinR
a291bc4a2c
Merge pull request #1292 from GriffinRichards/fix-partymenu
...
Remove unnecessary subtraction in switch
2021-01-04 20:49:08 -05:00
GriffinR
1b2c9d00ca
Merge pull request #1291 from Sierraffinity/master
...
Fix/document possible division by zero in ConvertScaleParam
2021-01-04 20:48:58 -05:00
GriffinR
eba7933c0c
Remove unnecessary subtraction in switch
2021-01-04 19:50:05 -05:00
Sierraffinity
67a656a4df
Fix/document possible division by zero in ConvertScaleParam
2021-01-04 16:26:28 -08:00
GriffinR
0ca76fc179
Some decoration labels, use constant for tileset size
2021-01-04 16:27:57 -06:00
GriffinR
039108284d
Clean up gDecorations with gItems format
2021-01-04 16:27:57 -06:00
GriffinR
e0c0143f41
Fix substitute back sprite
2021-01-04 10:14:01 -05:00
GriffinR
06af0f0fe5
Remove unnecessary string.h includes
2021-01-03 13:36:07 -05:00
GriffinR
d992e4277e
Merge pull request #1283 from GriffinRichards/doc-factscreen
...
Document battle factory screen
2021-01-03 02:51:59 -05:00
GriffinR
f2ce06683d
Merge pull request #1285 from GriffinRichards/doc-fieldscr
...
Minor field_screen_effect / field_player_avatar documentation
2021-01-03 01:59:36 -05:00
ultima-soul
b58a8390f3
Add Fairy-type icon to fix Fairy TM info icon being blank.
2021-01-02 21:21:52 -08:00
ExpoSeed
10f4b48215
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
GriffinR
4a04b16ac1
Merge pull request #1281 from GriffinRichards/index-bc
...
Index battle controller cmd tables
2021-01-01 17:14:34 -05:00
GriffinR
88e951bfe3
Label some ReturnToField funcs
2021-01-01 17:11:06 -05:00
GriffinR
c711a2f73b
Document warp spin functions
2021-01-01 17:11:02 -05:00
GriffinR
8cad412ae2
Label a few flash effect functions
2021-01-01 13:34:25 -05:00
amiosi
6c5852c4e0
colors n stuff
2020-12-31 13:13:10 -05:00
GriffinR
84fbcc9dd6
Fix modern -> UBFIX macro change
2020-12-31 00:44:43 -05:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen
2020-12-31 00:40:45 -05:00
GriffinR
093610b46e
Finish factory swap screen doc
2020-12-31 00:26:14 -05:00
Sierraffinity
ef7832a55c
Change how mon affine transform fix is handled
2020-12-30 17:36:53 -08:00
GriffinR
7ae78dc773
Finish factory select screen doc
2020-12-30 17:56:31 -05:00
GriffinR
0bf49198f6
Resume factory screen doc
2020-12-30 13:28:15 -05:00
GriffinR
2f426e0e7d
Index battle controller cmd tables
2020-12-29 17:21:58 -05:00
LOuroboros
32cb306b85
Tweaked evolution.h
...
Litleo doesn't need to have 2 different evolutions into Pyroar.
2020-12-27 00:10:14 -03:00
Sierraffinity
127bb97c0e
Add UBFIX for division by zero in SpriteCB_PokedexListMonSprite
2020-12-26 18:25:21 -08:00
Sierraffinity
bafbf9240d
Add UBFIX for null deref in sub_80D08CC
2020-12-26 17:47:36 -08:00
Sierraffinity
86fdd033c6
Add UBFIX for null derefs in sub_8088950
2020-12-26 17:39:52 -08:00
Sierraffinity
b155c307ea
Add UBFIX for null deref in CameraObjectReset2
2020-12-26 17:25:51 -08:00
GriffinR
d74f739e05
Merge pull request #1277 from GriffinRichards/doc-tower
...
Label remaining subs in battle_tower.c
2020-12-25 00:19:24 -05:00
GriffinR
769ddf22c2
Label remaining subs in battle_tower.c
2020-12-24 16:18:47 -05:00
ultima-soul
6a0939cd4e
Remove special handling for Deoxys.
2020-12-21 22:39:19 -08:00
Kurausukun
254b4e621c
change "filler" to "unk", remove newline
2020-12-22 00:08:15 -05:00
Kurausukun
45a1156dc8
fix remaining functions, finally matches
2020-12-21 22:36:28 -05:00
Kurausukun
01ea479390
oops
2020-12-21 20:25:59 -05:00
Kurausukun
b3f9a08ba6
fix sub_8021A28
2020-12-21 20:24:36 -05:00
ghoulslash
6f05ef01ac
Merge pull request #1306 from ExpoSeed/galar-mon-flags
...
Add Galarian Form mon flags
2020-12-21 10:05:19 -07:00
ghoulslash
a1e3700d10
Merge pull request #1299 from LOuroboros/cacophony
...
Cacophony
2020-12-21 09:47:52 -07:00
Kurausukun
3203bac053
fix struct
2020-12-20 23:15:35 -05:00
Kurausukun
14e2898a29
fix structs and some function logic
...
(currently does not match)
2020-12-20 02:54:33 -05:00
ExpoSeed
ef6a7fbf43
Add Galarian Form mon flags
2020-12-18 18:25:24 -06:00
LOuroboros
cb9faeed3d
Corrected the ability 1 of Calyrex's forms
...
There isn't an `ABILITY_AS_ONE` defined in the `include/constants/abilities.h` of the battle_engine branch, so this wasn't building a ROM correctly.
https://github.com/rh-hideout/pokeemerald-expansion/blob/pokemon_expansion/src/data/pokemon/base_stats.h#L34158
https://github.com/rh-hideout/pokeemerald-expansion/blob/battle_engine/include/constants/abilities.h#L290
2020-12-18 08:17:49 -03:00
ultima-soul
ad67068f7e
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into gen_8_mon_data
2020-12-16 13:28:42 -08:00
ultima-soul
c675c92a1d
Add Gen 8 Pokemon data.
2020-12-16 12:57:36 -08:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush
...
fakematch fixes, begin documenting Berry Crush (based on #1187 )
2020-12-14 23:22:41 -05:00
Kurausukun
69cfe5ad01
use direction constant
2020-12-14 21:54:19 -05:00
Kurausukun
68b456e7f9
name a2
2020-12-14 21:51:38 -05:00
Kurausukun
266a23b327
fix indentation
2020-12-14 21:44:25 -05:00
Kurausukun
6faa63347a
document reuse of variables in link mode
2020-12-14 21:41:30 -05:00
GriffinR
c611421882
Merge pull request #1267 from ipatix/m4a_names
...
refactor m4a.c/m4a_1.s constant/variable/type naming
2020-12-14 20:03:53 -05:00
GriffinR
18a5feb413
Merge pull request #1269 from GriffinRichards/bugfix
...
Use BUGFIX for some inline fixes
2020-12-14 20:00:59 -05:00
