Commit graph

11618 commits

Author SHA1 Message Date
LOuroboros
1980320aa4 Tweaked CanMonLearnTMTutor 2022-01-09 15:30:31 -03:00
Eduardo Quezada D'Ottone
3afda445ce
Merge pull request #2031 from LOuroboros/patch-2
Fixed usage of B_MULTI_BATTLE_WHITEOUT
2022-01-09 15:04:05 -03:00
LOuroboros
352523403a
Fixed usage of B_MULTI_BATTLE_WHITEOUT 2022-01-09 14:57:45 -03:00
GriffinR
429d53b95c Use runningState directly in CheckMovementInputNotOnBike 2022-01-09 11:12:35 -05:00
GriffinR
8b920691e6 Fix FLAG_DECORATION_0 name 2022-01-09 01:31:42 -05:00
GriffinR
8f1a760937 Add missing array constants in field_player_avatar 2022-01-08 23:55:26 -05:00
Eduardo Quezada D'Ottone
1374662998
Merge pull request #2030 from LOuroboros/patch-2
Update NUM_TECHNICAL_MACHINES
2022-01-08 21:42:54 -03:00
LOuroboros
5281fe63fc
Update NUM_TECHNICAL_MACHINES 2022-01-08 21:27:29 -03:00
Eduardo Quezada D'Ottone
8d0548f732 Fixed Wormadam sprite. Credit to Jaizu 2022-01-08 20:26:16 -03:00
Eduardo Quezada D'Ottone
f6b32c8d17 Fixed Anchor Shot description. 2022-01-08 20:19:53 -03:00
Eduardo Quezada D'Ottone
241aea9dfd Missing actually adding Hoopa Unbound 2022-01-08 19:58:01 -03:00
GriffinR
30dbf3f858
Merge pull request #1595 from sphericalice/patch-3
Remove unneeded brackets in GetWeekCount
2022-01-08 17:44:25 -05:00
Eduardo Quezada D'Ottone
787b9a0402 Gen VIII and missing forms 2022-01-08 18:24:21 -03:00
sphericalice
6a21c3f5f3
Remove unneeded brackets in GetWeekCount 2022-01-08 20:39:45 +00:00
TheXaman
f5fb9ec013
Merge pull request #12 from AsparagusEduardo/Xaman_MegaDex
Mega Pokémon entries
2022-01-08 20:53:10 +01:00
TheXaman
3a1f5adf7a
Update src/data/pokemon/pokedex_text.h
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-01-08 20:50:52 +01:00
Eduardo Quezada D'Ottone
8ae1e61c7c Mega Pokémon entries 2022-01-08 16:21:45 -03:00
TheXaman
075ddb44d4 Added Alolan form pokedex entries 2022-01-08 13:42:34 +01:00
Eduardo Quezada D'Ottone
eba4c36189
Merge pull request #2024 from TheXaman/rhh_BE_B_SLEEP_TURNS
Yawn now uses B_SLEEP_TURNS
2022-01-07 21:56:06 -03:00
Eduardo Quezada D'Ottone
fa2657bb61 Gen VII 2022-01-07 21:36:50 -03:00
GriffinR
ca9bc34bea Clean up pokemon_storage_system graphics 2022-01-07 17:36:38 -05:00
GriffinR
5cbe572607 Add window constants in pokemon_storage_system 2022-01-07 17:05:58 -05:00
Eduardo Quezada D'Ottone
97baedbd5e
Merge pull request #1923 from WiserVisor/battle_engine
Added Sky Drop to Battle Engine
2022-01-07 18:14:40 -03:00
GriffinR
a837d1fe2c
Merge pull request #1593 from laqieer/master
Fix macro v069 in sound/MPlayDef.s
2022-01-07 12:09:51 -05:00
laqieer
1c6232bc2e Fix macro v069 in sound/MPlayDef.s 2022-01-08 00:58:05 +08:00
TheXaman
6787dbadf9 RAPIDASH weight fix 2022-01-07 14:30:22 +01:00
TheXaman
34ff3c7e64 added FLAGs for the added data types to get rid of PokedexEntryFormSkip, inspired by @AsparagusEduardo 2022-01-07 13:45:00 +01:00
GriffinR
577e6cc740
Merge pull request #1586 from GriffinRichards/clean-areascreen
Clean up pokedex_area_screen
2022-01-06 23:02:23 -05:00
GriffinR
713cd6616e Add glow tile empty 2022-01-06 22:33:00 -05:00
GriffinR
71e0b480a9
Merge pull request #1591 from kiliwily/master
Fix brackets inconsistency in field_specials.c
2022-01-06 13:58:06 -05:00
kiliwily
8a9740b819 Update field_specials.c 2022-01-06 19:47:56 +01:00
kiliwily
ba9b533845 Revert "Update field_specials.c"
This reverts commit f67137ddb2.
2022-01-06 19:45:38 +01:00
kiliwily
f67137ddb2 Update field_specials.c 2022-01-06 19:29:58 +01:00
TheXaman
9a54c64b03 added categories for all entries, only changed ones filled, same entries as _("") 2022-01-06 16:38:12 +01:00
TheXaman
3b359dba4e added comment 2022-01-06 15:24:12 +01:00
TheXaman
6b71cca378 fixed the data issue, set weight/height to 0 if same as base data 2022-01-06 15:22:38 +01:00
TheXaman
024b903f21 added all other form data, broken atm due to initializer element for gPokedexEntriesForms[992].height' is not constant` 2022-01-06 14:51:42 +01:00
Eduardo Quezada D'Ottone
051ec7951d Gen V and VI 2022-01-05 22:26:14 -03:00
Eduardo Quezada D'Ottone
309c833961 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE_elevations 2022-01-05 20:39:17 -03:00
TheXaman
4f3019c789 tiny fix 2022-01-05 22:10:26 +01:00
TheXaman
1724d3304e Merge branch 'rhh_pokemon_expansion_formsDexData' of https://github.com/TheXaman/pokeemerald into rhh_pokemon_expansion_formsDexData 2022-01-05 22:06:25 +01:00
TheXaman
149bafc545 added all 48 megas and 2 primals 2022-01-05 22:05:59 +01:00
TheXaman
ee183db813
Update src/pokedex.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-01-05 21:17:20 +01:00
TheXaman
6846d3f6b6 added base for form heigth, weight and dex description, alolan data from bulbapedia and galarian from psf#2936 2022-01-05 21:09:00 +01:00
GriffinR
d4111d5520 Add comment about pokedex reordering 2022-01-05 14:50:19 -05:00
TheXaman
328b501394
Update src/battle_util.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2022-01-05 18:54:42 +01:00
TheXaman
9733f92c7f Yawn now uses B_SLEEP_TURNS, resolves #1873 2022-01-05 18:48:01 +01:00
GriffinR
5d033c2e4d Convert pokedex defines to enums 2022-01-05 12:18:49 -05:00
Eduardo Quezada D'Ottone
d4f03c65e9
Merge pull request #2023 from TheXaman/pokemon_expansion_debug_fixes
fixes for pokemon_debug.c of values not beeing applied/reset
2022-01-05 09:35:00 -03:00
TheXaman
813fc6d726 fixes: -const and offset data not beeing reset on form change
-new offset values not beeing applied on normal/shiny change
2022-01-05 12:34:54 +01:00