Eduardo Quezada
7774c9727d
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230125
...
# Conflicts:
# tools/mapjson/mapjson.cpp
2023-01-25 20:28:55 -03:00
GriffinR
29c1af50ca
Fix Best Streak stat name
2023-01-20 11:25:04 -05:00
Eduardo Quezada
749225ace1
Matching merge from upstream pret
...
# Conflicts:
# graphics/interface/menu_info.png
# include/pokemon.h
# src/battle_ai_switch_items.c
# src/battle_anim_mons.c
# src/battle_anim_water.c
# src/battle_controller_opponent.c
# src/battle_gfx_sfx_util.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/data/pokemon/species_info.h
# src/pokemon.c
# src/pokemon_summary_screen.c
2023-01-20 12:31:54 -03:00
GriffinR
0cc10a1ada
Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize
2023-01-18 11:07:12 -05:00
Eduardo Quezada
e858b4e709
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
...
# Conflicts:
# include/battle.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_dome.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/battle_tower.c
# src/data/pokemon/species_info.h
# src/pokemon.c
2022-11-24 15:36:00 -03:00
Eduardo Quezada
7327be6f9e
Made Types and Egg Groups into arrays
2022-11-22 17:05:25 -03:00
GriffinR
4736b4b14d
Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename
...
Renamed gBaseStats to gSpeciesInfo
2022-11-18 17:45:23 -05:00
GriffinR
1d1c2d41bb
Add list menu cursor constants
2022-11-09 15:16:46 -05:00
Eduardo Quezada
3ed485632f
Renamed gBaseStats to gSpeciesInfo
2022-10-24 17:01:48 -03:00
Eduardo Quezada
68b474c0f0
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007
...
# Conflicts:
# include/constants/items.h
# src/battle_interface.c
2022-10-07 14:52:32 -03:00
Eduardo Quezada D'Ottone
3b983aae14
Apply suggestions from code review
2022-09-25 08:31:24 -03:00
LOuroboros
a9ab3286ef
Fixed IsPlayerInFrontOfPC
2022-09-25 05:51:08 -03:00
LOuroboros
8e9bfda120
Update field_specials.c
2022-09-24 22:22:18 -03:00
LOuroboros
00eb67608a
Small tweak to the new check in PCTurnOffEffect
2022-09-24 22:10:46 -03:00
LOuroboros
5500e64a71
Reworked the debug menu's PC access
2022-09-24 17:26:41 -03:00
GriffinR
1107ff954d
Clean up shop.c
2022-09-22 15:08:17 -04:00
Eduardo Quezada D'Ottone
8ca2f949e3
Merge pull request #2233 from gruxor/tmhm_rework
...
Reworked TMHM into expandable list format
2022-08-29 04:20:45 -04:00
crater-git
9f16d1dd12
Fixed battle frontier tutors (for real this time)
2022-08-27 22:45:10 -04:00
Eduardo Quezada
7c86bd5d08
Merge remote-tracking branch 'pret/master' into RHH_pretMerge20220826
...
# Conflicts:
# include/battle_interface.h
# src/battle_anim_effects_1.c
# src/battle_script_commands.c
# src/field_specials.c
2022-08-26 22:23:37 -04:00
GriffinR
578064d799
Add missing use of METATILE_ROW_WIDTH
2022-08-26 15:23:54 -04:00
Eduardo Quezada D'Ottone
bee36edd9c
Merge pull request #2173 from LOuroboros/yourAffection
...
Implement affection-now-friendship mechanics
2022-08-26 14:54:32 -04:00
crater-git
54ee960970
Fixed Battle Frontier tutor move IDs
2022-08-26 10:12:11 -04:00
crater-git
ed02c4b425
Removed tutor move distinction, combined llists
2022-08-25 19:56:47 -04:00
LOuroboros
23bf67c63f
Removed unnecessary inclusion of header in src/field_specials.c
2022-08-25 11:43:01 -03:00
LOuroboros
11d6ae4820
Renamed the GetLeadMonFriendshipScore constants
2022-08-25 11:34:37 -03:00
LOuroboros
e792fae415
Review corrections
...
-Simplified the affection mechanics' battle scripts.
-Corrected the value seting inside CalcCritChanceStage.
-Simplified the checks inside Cmd_adjustdamage
-Simplified the contents of GetLeadMonFriendshipScore now that a more general function to do the same thing was added.
-Added constants for the values returned by GetMonFriendshipScore.
2022-08-25 10:45:57 -03:00
LOuroboros
1f4ef2a0fb
Added constants for GetLeadMonFriendshipScore
2022-08-25 10:40:56 -03:00
Martin Griffin
d57442a511
Decimal paletteNums
2022-08-19 17:05:22 +01:00
Martin Griffin
6fed961ed6
Write palette IDs in hex
2022-08-19 15:29:35 +01:00
tustin2121
1cb659df8c
Renaming Script Contexts
...
- Determined how the various script contexts were used and renamed accordingly.
- ScriptContext2_Enable/Disable => Lock/UnlockPlayerFieldControls - The sole purpose of the flag is to make sure the player can't move around in the overworld. It has nothing to do with script contexts.
- ScriptContext1 => ScriptContext - It is the global script context used to set up scripts which run over many frames.
- ScriptContext2_RunNewScript => RunScriptImmediately - ScriptContext2's sole purpose was to run scripts immediately and in a separate context, usually while the global context is waiting for things like map loads or screen changes.
2022-08-15 15:18:12 -04:00
WhenGryphonsFly
86881b12ef
Use PARTY_SIZE for Pokerus Nurse Conversation
2022-08-10 19:09:59 -05:00
DizzyEggg
c991131b75
Change language stuff based on the french decomp
2022-08-04 11:53:16 +02:00
Eduardo Quezada
a72d4c4168
Cleanup from syncing pss and mon markings
2022-07-30 12:43:14 -04:00
Eduardo Quezada
a37d8b1346
Documented boolean uses
2022-07-25 14:59:14 -04:00
GriffinR
34438e6bc4
Continue documenting generic arguments
2022-06-03 15:38:03 -04:00
cbt6
f826a5a82d
Use constants for PC locations
2022-02-23 15:07:22 +08:00
GriffinR
2efbd5f549
Merge pull request #1608 from GriffinRichards/fix-fieldmap
...
Fix some incorrect fieldmap names
2022-01-26 17:51:56 -05:00
GriffinR
a8b466dc80
Disambiguate fieldmap names
2022-01-19 10:15:32 -05:00
GriffinR
4dec9b83a3
Move more graphics out of misc
2022-01-14 12:29:30 -05:00
sphericalice
6a21c3f5f3
Remove unneeded brackets in GetWeekCount
2022-01-08 20:39:45 +00: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
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
61aa9c3ba9
More updating event macro comments
2021-11-16 17:46:34 -05:00
GriffinR
5d9c31a610
Label slot machine ids, fix GetPriceReduction
2021-11-16 15:43:52 -05:00
GriffinR
04cc923d6c
Handle optional arguments for warp commands, add WARP_ID_NONE
2021-11-16 10:53:00 -05:00
GriffinR
c1130592fa
Drop some overworld prefixes
2021-11-15 10:58:05 -05:00
