Commit Graph

11502 Commits

Author SHA1 Message Date
LOuroboros
c137b01dd8
Update debug.c 2022-09-19 04:19:19 -03:00
ghoulslash
add3625589 fix natural cure, shed skin, early bird check in ShouldSwitchIfGameStatePrompt 2022-09-18 22:47:30 -04:00
Eduardo Quezada
adb4e54e95 Fixed multi battle battler coordinates and party menu when only one Pokémon is chosen 2022-09-18 22:34:06 -03:00
Eduardo Quezada D'Ottone
681ad8c7a9 Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig
# Conflicts:
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/form_change_tables.h
#	src/data/pokemon/form_species_table_pointers.h
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
2022-09-18 18:25:05 -03:00
Eduardo Quezada D'Ottone
f3ac3e4dc3 Merge remote-tracking branch 'RHH_origin/master' into RHH/dev_1.x 2022-09-18 01:12:06 -03:00
Eduardo Quezada D'Ottone
2c287b779f
Merge pull request #2334 from Porygon23/Critical-Bug-Fix
Fixed ACE_POKEMON_FUNCTIONALITY
2022-09-18 00:57:37 -03:00
Eduardo Quezada D'Ottone
41ae8ecdb7
Update src/battle_controller_opponent.c 2022-09-18 00:51:34 -03:00
Eduardo Quezada D'Ottone
293a880238
Apply suggestions from code review 2022-09-18 00:50:21 -03:00
Ct11217
5f74781a7d Remove ACE_POKEMON_FUNCTIONALITY 2022-09-17 17:44:50 -06:00
tustin2121
5c55e44173 More diagrams
- Diagramed all subsprite tables in the code base. There's a LOT in the slot machine code.
2022-09-17 14:34:20 -04:00
tustin2121
c371a44a83 Formatting 2022-09-17 13:34:54 -04:00
tustin2121
13877f71dc Minor documentation
Some things I figured out while working on my hack.
- The Subsprite tables do not use `DISPLAY_WIDTH`, but rather use -16, since they are signed bytes. The negative numbers better illustrate what the tables are doing.
- Figured out the as-of-yet undocumented data in SpriteCB_FlygonSilhouette
2022-09-17 13:33:10 -04:00
ghoulslash
b75c8e0525
Merge pull request #2330 from rh-hideout/1.1.0
Version 1.1.0
2022-09-17 10:46:34 -04:00
Eduardo Quezada
8a68596b64 Removed free macro 2022-09-16 20:36:44 -03:00
Eduardo Quezada
e412ec30a0 Removed calloc macro 2022-09-16 20:34:22 -03:00
Eduardo Quezada
63156b4398 Removed malloc macro 2022-09-16 20:24:26 -03:00
ghoulslash
8bbe1b9037
Merge pull request #2327 from AsparagusEduardo/RHH/pr/Metronome
Config to limit the moves called by Metronome (by generation)
2022-09-16 11:03:33 -04:00
ghoulslash
62815d9763
Merge pull request #2308 from AsparagusEduardo/RHH/pr/pretmerge_20220909
Friday merge, what a concept (weekly pret merge 2022/09/09)
2022-09-16 11:03:01 -04:00
Eduardo Quezada
6b79c7772c Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909
# Conflicts:
#	src/battle_interface.c
2022-09-16 11:56:50 -03:00
Eduardo Quezada
672f572ff8 Config to limit the moves called by Metronome (by generation) 2022-09-16 11:04:30 -03:00
ghoulslash
ed81ec41bc
Merge pull request #2324 from ghoulslash/be/aiswitch
fix ai switch semi invulnerable
2022-09-15 23:15:02 -04:00
ghoulslash
95a3ead254 styling fix 2022-09-15 22:10:39 -04:00
Eduardo Quezada D'Ottone
7825153bb2
Merge pull request #2282 from AsparagusEduardo/RHH/pr/tutorFix
Exp Candy Fixes
2022-09-15 22:46:59 -03:00
ghoulslash
20190ac85a fix ai switch semi invulnerable 2022-09-15 18:34:15 -04:00
ghoulslash
133aa9e28d
Merge pull request #2306 from AsparagusEduardo/RHH/pr/autogenNames
Generating music names for the debug menu based on their labels
2022-09-15 18:02:27 -04:00
ghoulslash
6616c89451
Merge pull request #2303 from Blackforest92/RHH-PR-Branch
Tidying graphics - Trio Weather
2022-09-15 18:01:43 -04:00
ghoulslash
6cfacb396e
Merge pull request #2307 from AsparagusEduardo/RHH/pr/debugMapCount
Automated creation of MAP_GROUP_COUNT for the debug menu
2022-09-15 18:01:05 -04:00
ghoulslash
5bdd292dc3
Merge pull request #2310 from AsparagusEduardo/RHH/pr/FairyUses
Added missing uses of Fairy type for Union Room and Battle Factory
2022-09-15 18:00:38 -04:00
ghoulslash
354a8256e4
Merge pull request #2226 from Porygon23/AI-Logic-Updates
Added corner case logic for AI Switching.
2022-09-15 17:56:35 -04:00
Eduardo Quezada
bca1267ca8 Altered MAX_FRONTIER_PARTY_SIZE to be automatically calculated by the other frontier party sizes 2022-09-15 14:52:18 -03:00
GriffinR
36494c1c1d
Merge pull request #1783 from AsparagusEduardo/pret/pr/battlerReservedPalettes
gReservedSpritePaletteCount using MAX_BATTLERS_COUNT for battles
2022-09-14 12:14:33 -04:00
Eduardo Quezada
492380bd24 gReservedSpritePaletteCount using MAX_BATTLERS_COUNT for battles 2022-09-14 12:20:59 -03:00
Eduardo Quezada D'Ottone
8f0054a0cd
Merge pull request #2315 from TheXaman/rhh_debug_flicker_fix
Debug menu: removes flickering, adds weather menu, misc. fixes
2022-09-14 11:05:46 -03:00
TheXaman
ef4e64c2f7 -added a submenu to set the weather
-lowest flag is 1
2022-09-14 15:19:23 +02:00
TheXaman
1e03b4747f debug menu: object events now frozen while open 2022-09-14 13:43:26 +02:00
TheXaman
2c20514035 improved debug menu function declaration consistency 2022-09-14 13:39:35 +02:00
Eduardo Quezada
c68ca72fb0 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 2022-09-13 16:26:59 -03:00
Eduardo Quezada
de32940fdf Further removed trailing whitespaces 2022-09-13 16:26:36 -03:00
Eduardo Quezada
1d7e8bd730 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
# Conflicts:
#	asm/macros/battle_ai_script.inc
#	asm/macros/battle_script.inc
#	data/battle_ai_scripts.s
#	include/link_rfu.h
#	src/pokemon.c
#	src/pokemon_summary_screen.c
#	src/sound.c
2022-09-13 16:22:42 -03:00
GriffinR
c1dfd3c9ec
Merge pull request #1763 from GriffinRichards/rm-global
Drop usage of global directive
2022-09-13 15:08:37 -04:00
GriffinR
509f1d59cd
Merge pull request #1782 from LOuroboros/patch-2
Removed unused extern declaration of old gUnknown func
2022-09-13 14:51:20 -04:00
LOuroboros
2d841a25f9
Removed unused extern declaration of old gUnknown func 2022-09-13 15:45:01 -03:00
GriffinR
91c040b081
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace
Cleaned trailing whitespace
2022-09-13 14:00:11 -04:00
Ct11217
96d190f5ad Updated Toxic Status Counter 2022-09-12 20:39:21 -06:00
GriffinR
4c34babb4d
Merge pull request #1780 from LOuroboros/raquaza
Fixed a typo and scripting vars alignment
2022-09-12 22:02:46 -04:00
GriffinR
e7a459c778
Merge pull request #1781 from AsparagusEduardo/pret/pr/argumentsHeaders
Added missing labels in headers
2022-09-12 21:27:57 -04:00
LOuroboros
14c6d8b91a Fixed alignment for the value of vars 0x4020 to 0x40FF 2022-09-12 21:33:03 -03:00
LOuroboros
cb83a09203 Fixed vars alignment 2022-09-12 21:27:53 -03:00
LOuroboros
222362e804 Fixed Raquaza typo 2022-09-12 21:26:22 -03:00
Eduardo Quezada
5eb9312250 Added missing labels in headers 2022-09-12 21:14:15 -03:00