Commit Graph

9461 Commits

Author SHA1 Message Date
GriffinR
4024b3f1b3
Merge pull request #1590 from GriffinRichards/dex-enum
Convert pokedex defines to enums
2022-01-10 14:56:26 -05:00
Wiz
ded2021361 Remove redundant assembler 2022-01-09 14:42:41 -06: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
f6b32c8d17 Fixed Anchor Shot description. 2022-01-08 20:19:53 -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
sphericalice
6a21c3f5f3
Remove unneeded brackets in GetWeekCount 2022-01-08 20:39:45 +00: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
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
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
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
W1serV1ser
178c4c66ba Fixed gSideTimers typo 2022-01-04 12:38:50 -08:00
W1serV1ser
66faa6aa15 Follow Me/Rage Powder effect on target goes away once affected by Sky Drop 2022-01-04 12:33:31 -08:00
GriffinR
ce55e58ad8 Misc cleanup 2022-01-04 10:09:42 -05:00
GriffinR
45e8cd4b84
Merge pull request #1589 from sphericalice/patch-2
Use SPECIES_NONE and ITEM_NONE in battle_tower.c
2022-01-04 08:55:33 -05:00
sphericalice
48bf1ab98d
Use SPECIES_NONE and ITEM_NONE in battle_tower.c 2022-01-04 13:46:46 +00:00
GriffinR
ac47489216
Merge pull request #1588 from sphericalice/patch-1
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu
2022-01-02 16:09:31 -05:00
sphericalice
2d536bf560
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu 2022-01-02 21:02:53 +00:00
Eduardo Quezada D'Ottone
d433d67558 Extrapolated Assist forbidden flags to Gen 8 moves 2022-01-01 20:21:29 -03:00
Eduardo Quezada D'Ottone
221e38ff86
Merge pull request #1957 from ghoulslash/be/ability_popup
Ability Popup Fixes + Longer Ability Names config
2022-01-01 19:39:55 -03:00
GriffinR
434086be69
Merge pull request #1585 from sphericalice/patch-2
Update field_specials.c to match the style
2021-12-31 12:39:43 -05:00
sphericalice
61a0036c47
Clarify ScrollableMultichoice_ProcessInput comment 2021-12-31 17:34:46 +00:00
sphericalice
9e660b2cdf
Update src/field_specials.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-31 16:29:11 +00:00
sphericalice
4f6323606f
Update field_specials.c to match the style 2021-12-31 16:24:44 +00:00
GriffinR
23f5c9fd5c Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
GriffinR
643cc62f73
Merge pull request #1584 from sphericalice/patch-1
Remove some magic numbers from TryPushBoulder
2021-12-30 09:00:08 -05:00
sphericalice
50522fdea4
Remove some magic numbers from TryPushBoulder 2021-12-30 12:21:47 +00:00
Eduardo Quezada D'Ottone
6fcbc4c074
Merge pull request #2012 from LOuroboros/patch-2
Update battle_ai_util.c
2021-12-30 07:32:30 -03:00
LOuroboros
34c6e6ca31
Update battle_ai_util.c 2021-12-30 01:48:56 -03:00
Eduardo Quezada D'Ottone
5b54986e6b
Merge pull request #1980 from LOuroboros/multiBattles
Multi battle updates
2021-12-29 22:09:06 -03:00
Eduardo Quezada D'Ottone
ba43280a7c Refactored Instruct to use the regular forbidden move lookup table 2021-12-29 21:04:15 -03:00
GriffinR
4192a40adf
Merge pull request #1583 from GriffinRichards/renametilemaps
Give less generic names to some tilemaps, some misc fixes
2021-12-29 00:57:37 -05:00
Eduardo Quezada D'Ottone
16398d4dc6
Merge pull request #2009 from LOuroboros/patch-2
Update pokemon.h
2021-12-28 22:49:10 -03:00
GriffinR
aadab8b016 Move pokemon and easy chat constants to global, misc clean-up 2021-12-28 18:07:41 -05:00
GriffinR
aba5264260 RGB macro use in slot_machine 2021-12-28 17:46:05 -05:00