ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-28 21:30:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,425 Commits 1 Branch 0 Tags 235 MiB
dbd02d3a56
Commit Graph

2946 Commits

Author SHA1 Message Date
GriffinR
65d3944a93 Give tileset palettes proper type, name compressed secret base tiles 2022-10-08 02:02:12 -04:00
Eduardo Quezada
453da8aa8c Moved ILLEGAL_BATTLE_TYPES to include\constants\battle.h and renamed it to BATTLE_TYPE_RECORDED_INVALID 2022-10-07 15:49:00 -03:00
GriffinR
e293986fbb
Merge pull request #1793 from GriffinRichards/clean-shop 
Clean up shop.c
 2022-10-06 17:24:53 -04:00
GriffinR
c6e4c29ea3
Merge pull request #1792 from GriffinRichards/display-tiles 
Add DISPLAY_TILE_* constants
 2022-10-05 20:44:28 -04:00
Eduardo Quezada
a20334f79a Removed unused functions in item header 2022-10-04 22:06:07 -03:00
GriffinR
6db489e2d5 Use constants for overworld object palette slots 2022-09-27 20:16:48 -04:00
GriffinR
4f407a1066 Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
GriffinR
e515e52abb Add DISPLAY_TILE_* constants 2022-09-26 19:52:17 -04:00
Eduardo Quezada
5054cf3586 Documented unk40EF in Summary Screen 2022-09-25 21:33:20 -03:00
GriffinR
9b6b164aad
Merge pull request #1768 from SBird1337/feature/mgba-print 
[debug] add support for mgba printf
 2022-09-23 13:49:48 -04:00
sbird
343d7f7d26 [debug] do not use heap allocation for MgbaPrintf 2022-09-23 04:12:57 +02:00
sbird
12670e8e3e [debug] simplify macros, add EX versions 2022-09-23 03:48:58 +02:00
sbird
22329d3318 [debug] use boolean constants for nStopProgram 2022-09-23 03:23:44 +02:00
sbird
44a5a8d31e [debug] fix AGBAssert for AGBPrintf debug block 2022-09-23 03:22:57 +02:00
GriffinR
1107ff954d Clean up shop.c 2022-09-22 15:08:17 -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
91c040b081
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace 
Cleaned trailing whitespace
 2022-09-13 14:00:11 -04: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
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
GriffinR
d3d8b4a181
Merge pull request #1762 from GriffinRichards/sync-fieldmap 
Sync fieldmap
 2022-09-12 14:32:27 -04:00
Eduardo Quezada
65108c3192 Cleaned trailing whitespace 2022-09-11 14:14:49 -04:00
Eduardo Quezada
61752a4977 Added parenthesis to GET_SHINY_VALUE 2022-09-11 13:35:58 -04:00
Eduardo Quezada
9144779634 Removed repeated extern consts in strings.h 2022-09-09 08:49:16 -04:00
sbird
3a0759d458 [doc] fix misnamed dma <--> aslr 2022-09-07 14:37:03 +02:00
GriffinR
74b563f696
Merge pull request #1749 from GriffinRichards/ur-classes 
Fix names and constant usage for union room classes
 2022-09-06 21:35:10 -04:00
sbird
584bfe0221 [debug] add support for mgba printf 
* adds support for mgba printf debugging as well as adding support for switching between debugging configuration
* adds `mini_printf` as an alternative to libc printf as well as switches to choose a pretty printing handler
* adds a pretty printing format to `mini_printf` to print preproc encoded strings
 2022-09-06 13:40:31 +02:00
Eduardo Quezada
41bf6bde25 Removed pointless macro 2022-09-03 00:28:53 -04:00
GriffinR
03a98c72bc Sync fieldmap 2022-09-02 19:29:35 -04:00
Eduardo Quezada
c7fc2e13f7 Renamed TM flags to keep consistency with the rest of the repo 2022-09-02 16:54:58 -04:00
GriffinR
a28fbbc1b8
Merge pull request #1748 from GriffinRichards/fix-judgement 
Standardize judgement vs judgment spelling
 2022-09-01 11:51:04 -04:00
Eduardo Quezada
15d611ba65 Usage of BATTLE_PARTNER 2022-08-27 01:26:13 -04:00
Eduardo Quezada
0a34d47041 Merge remote-tracking branch 'pret/master' into pret_clean2 2022-08-27 00:56:00 -04:00
GriffinR
0516f94837
Merge pull request #1753 from LOuroboros/GetLeadMonFriendshipScore 
Added constants for GetLeadMonFriendshipScore
 2022-08-26 14:52:10 -04:00
GriffinR
c5e873aa2b
Merge pull request #1742 from GriffinRichards/sound-pan 
Add missing usage of SOUND_PAN_*
 2022-08-26 14:47:24 -04:00
GriffinR
ce4a6e9067 MAP_NONE -> MAP_DYNAMIC 2022-08-25 21:34:05 -04:00
LOuroboros
11d6ae4820 Renamed the GetLeadMonFriendshipScore constants 2022-08-25 11:34:37 -03:00
LOuroboros
1f4ef2a0fb Added constants for GetLeadMonFriendshipScore 2022-08-25 10:40:56 -03:00
GriffinR
3771abbe08 Fix names and constant usage for union room classes 2022-08-23 12:44:07 -04:00
GriffinR
898ec580ae
Merge pull request #1737 from GriffinRichards/lock-unlock 
Clean up lock/unlock anim movement
 2022-08-22 01:30:33 -04:00
GriffinR
30906762ed
Merge pull request #1740 from AsparagusEduardo/pret_stringTabs 
Fixed inconsistent use of white space for scripts, .c files and .h files.
 2022-08-20 23:03:59 -04:00
GriffinR
261b0ff118 Standardize judgement vs judgment spelling 2022-08-20 22:58:46 -04:00
GriffinR
9e175a1037
Merge pull request #1735 from GriffinRichards/arena-const 
Add some missing battle arena constants
 2022-08-20 22:54:32 -04:00
Eduardo Quezada
76d2d92abb Merge branch 'pretmaster' into pret_clean2 2022-08-20 12:43:09 -04:00
GriffinR
1685365cd4
Merge pull request #1727 from AsparagusEduardo/pret_clean 
Cleanup from https://github.com/pret/pokefirered/pull/532
 2022-08-19 21:27:55 -04:00
Martin Griffin
d57442a511 Decimal paletteNums 2022-08-19 17:05:22 +01:00
GriffinR
c2d5dd2a1f Additional battle anim sync 2022-08-19 11:51:13 -04:00
Martin Griffin
5719a7f7bc Use static inline instead of extern inline for modern 2022-08-19 15:47:50 +01:00
Martin Griffin
6fed961ed6 Write palette IDs in hex 2022-08-19 15:29:35 +01:00
Eduardo Quezada
3bc2cf921c Sync src/battle_controllers.c with pokefirered 2022-08-18 14:30:22 -04:00
Eduardo Quezada
59f89bde9e Misc cleanup 2022-08-18 14:23:45 -04:00
Eduardo Quezada
5933c42439 Synced Route 4 and 10's MapSec labels 2022-08-16 18:23:37 -04:00
GriffinR
26734d80f3
Merge pull request #1728 from AsparagusEduardo/pret_monDataEnum 
Convert MON_DATA constants into enum to ease editing and addition of fields.
 2022-08-15 18:51:32 -04:00
Eduardo Quezada
0149f420f9 Corrected comment 2022-08-15 17:36:55 -04:00
Eduardo Quezada
e8a05e92e4 Corrected additional inconsistent uses of whitespace 2022-08-15 17:04:34 -04:00
tustin2121
ec73158f16 Moving documentation comments per request 
from the discord chat.
 2022-08-15 16:37:38 -04: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
GriffinR
5515e328b2 Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
GriffinR
2df6cc1820
Merge pull request #1730 from GriffinRichards/sync-naming-screen 
Clean up naming screen graphics
 2022-08-12 11:05:55 -04:00
GriffinR
574cf1ddb9
Merge pull request #1725 from GriffinRichards/security-signature 
Sector security -> signature
 2022-08-12 10:47:10 -04:00
GriffinR
cf4d05e9e7 Fix typo 2022-08-11 12:09:38 -04:00
GriffinR
63468f9fcb Add some missing battle arena constants 2022-08-11 12:02:56 -04:00
GriffinR
286a99eb1d
Merge pull request #1723 from GriffinRichards/fix-impassable 
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
 2022-08-10 21:28:14 -04:00
GriffinR
bfdbbad468 Split naming screen palettes/graphics, use correct image palettes, clean up 2022-08-09 09:27:28 -04:00
Eduardo Quezada
1fd1870a13 Moved enum to include/pokemon.h 2022-08-08 18:40:47 -04:00
Eduardo Quezada
75d52dc762 Convert MON_DATA constants into enum to ease editing and addition of fields. 2022-08-08 18:18:17 -04:00
Eduardo Quezada
4b08a511c3 Cleanup from https://github.com/pret/pokefirered/pull/532 2022-08-07 22:40:15 -04:00
GriffinR
2487ddb128 Sector security -> signature 2022-08-05 10:42:31 -04:00
DizzyEggg
c991131b75 Change language stuff based on the french decomp 2022-08-04 11:53:16 +02:00
GriffinR
e5c36cd745 MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes 2022-08-03 14:21:13 -04:00
GriffinR
79384ec9f3
Merge pull request #1702 from GriffinRichards/clean-psn 
Clean up field_poison.c
 2022-08-02 13:20:49 -04:00
GriffinR
99a37b5aa5
Merge pull request #1717 from mrgriffin/trainer-party-macro 
Macros for keeping .partyFlags, .partySize, and .party in sync
 2022-08-02 13:11:43 -04:00
GriffinR
79c5a5983e
Merge pull request #1721 from AsparagusEduardo/pret_clean2 
Companion PR to pokefirered #525
 2022-08-01 16:57:40 -04:00
GriffinR
5101811407
Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands 
Further cleaning after comparing with pokefirered
 2022-07-30 09:09:23 -04:00
Eduardo Quezada
40805fffc0 Space cleanup 2022-07-29 21:28:39 -04:00
Eduardo Quezada
5d4b76c0ba Review changes from pokefirered #524 2022-07-29 17:00:07 -04:00
Eduardo Quezada
9dc64b67cd Review changes 2022-07-29 15:38:23 -04:00
Eduardo Quezada
01558ff8f3 Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
Eduardo Quezada
13672680b0 void pointer standarized 2022-07-29 10:52:35 -04:00
Eduardo Quezada
7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
Eduardo Quezada
9caca17064 Cleanup by syncing src/battle_script_commands.c with pokefirered 2022-07-29 09:43:16 -04:00
Jaizu
7a8c28ccca
Remove duplicated CB2_InitCopyrightScreenAfterBootup 2022-07-29 10:52:36 +02:00
Eduardo Quezada
09af7422d5 Further cleaning after comparing with pokefirered 
STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs
 2022-07-28 01:27:05 -04:00
Martin Griffin
2380d13a43 Macros for keeping .partyFlags, .partySize, and .party in sync 2022-07-27 23:25:37 +01:00
GriffinR
1da46a4bbc
Merge pull request #1715 from AsparagusEduardo/pret_docBooleans 
Documented boolean uses
 2022-07-27 12:09:02 -04:00
LOuroboros
b59f7aed7f
Added a constant for NPC trainer name length (#1712) 2022-07-25 22:59:13 -04:00
Eduardo Quezada
a37d8b1346 Documented boolean uses 2022-07-25 14:59:14 -04:00
GriffinR
30a5821997
Merge pull request #1705 from sphericalice/move-unavailable 
Introduces a MOVE_UNAVAILABLE constant
 2022-07-12 11:32:57 -04:00
sphericalice
186f2c0232 Introduce a MOVE_UNAVAILABLE constant 2022-07-11 15:18:13 +01:00
LOuroboros
a1004485c5 Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH 2022-07-10 20:08:28 -03:00
GriffinR
06dc93fc2f Clean up field_poison.c 2022-07-06 21:04:54 -04:00
GriffinR
57222323c1
Merge pull request #1678 from GriffinRichards/const-frontier 
Add some battle frontier constant usage
 2022-06-18 10:22:58 -04:00
GriffinR
4660f8c88b Document battle tower TV show 2022-06-14 09:37:39 -04:00
GriffinR
7143865f6f Add some battle frontier constant usage 2022-06-09 12:57:28 -04:00
GriffinR
1f540845cb
Merge pull request #1675 from GriffinRichards/doc-arg 
Document generic arguments
 2022-06-09 11:11:02 -04:00
GriffinR
bc2dbd772e Add warning to NUM_OBJ_EVENT_GFX 2022-06-03 16:18:34 -04:00
GriffinR
1ca1bff81c Merge branch 'master' of https://github.com/GriffinRichards/pokeemerald into doc-arg 2022-06-03 15:43:21 -04:00
GriffinR
34438e6bc4 Continue documenting generic arguments 2022-06-03 15:38:03 -04:00