 GriffinR
|
8a8ba92f21
|
Revert COMMON wildcards
|
2022-08-22 19:04:47 -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
|
9e175a1037
|
Merge pull request #1735 from GriffinRichards/arena-const
Add some missing battle arena constants
|
2022-08-20 22:54:32 -04:00 |
|
|
GriffinR
|
81ef818f61
|
Merge pull request #1731 from GriffinRichards/missing-tag
Move party menu data constants
|
2022-08-20 22:43:52 -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 |
|
|
GriffinR
|
cce9918908
|
Add Wnum_tiles to additional num_tiles rules
|
2022-08-18 23:13:27 -04:00 |
|
|
GriffinR
|
936ebbd973
|
Fix phaseShit typo
|
2022-08-17 11:47:00 -04:00 |
|
|
GriffinR
|
e707cdffa8
|
Merge pull request #1744 from AsparagusEduardo/pret_syncMapSec
Synced Route 4 and 10's MapSec labels
|
2022-08-16 19:12:45 -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 |
|
|
GriffinR
|
96fa350b45
|
Merge pull request #1741 from tustin2121/tustin2121-patch-scriptcontext
Renaming the Script Contexts
|
2022-08-15 16:46:01 -04:00 |
|
|
GriffinR
|
3dc3dc847f
|
Merge pull request #1738 from mrgriffin/wildcard-ld-script
Wildcards in ld_script.txt
|
2022-08-15 08:35:48 -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
|
e814fe0224
|
Merge pull request #1734 from WhenGryphonsFly/clean__battledomebugfix
Fix BUGFIX return statement in battle_dome.c
|
2022-08-10 21:21:54 -04:00 |
|
|
GriffinR
|
cd5a03d4aa
|
Merge pull request #1733 from WhenGryphonsFly/clean__pokeruspartysize
Use PARTY_SIZE for Pokerus Nurse Conversation
|
2022-08-10 20:45:57 -04:00 |
|
|
GriffinR
|
e06ba39751
|
Use button constants in Task_HandleChooseMonInput
|
2022-08-10 15:14:35 -04:00 |
|
|
GriffinR
|
f534e8e44a
|
Move party menu data constants
|
2022-08-10 14:30:01 -04:00 |
|
|
GriffinR
|
bfdbbad468
|
Split naming screen palettes/graphics, use correct image palettes, clean up
|
2022-08-09 09:27:28 -04:00 |
|
|
GriffinR
|
079b1762ac
|
Update special save sector size checks
|
2022-08-05 12:11:33 -04:00 |
|
|
GriffinR
|
2487ddb128
|
Sector security -> signature
|
2022-08-05 10:42:31 -04:00 |
|
|
GriffinR
|
aa9ccbf194
|
Merge pull request #1724 from DizzyEggg/lang_improvements
Accomodate some parts of code based on the french decomp
|
2022-08-04 21:37:19 -04: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 |
|
|
GriffinR
|
591eef550e
|
Merge pull request #1720 from Jaizu/patch-25
Remove duplicated CB2_InitCopyrightScreenAfterBootup
|
2022-07-29 06:56:35 -04:00 |
|
|
GriffinR
|
456d45985f
|
Merge pull request #1718 from AsparagusEduardo/pret_cleanEvoScene
Cleaned by comparing evolution_scene.c with pokefirered
|
2022-07-27 21:54:34 -04:00 |
|
|
GriffinR
|
4ffe75c611
|
Merge pull request #1707 from GriffinRichards/use-pocket-consts
Add some missing pocket constant usage
|
2022-07-27 12:22:01 -04:00 |
|
|
GriffinR
|
1da46a4bbc
|
Merge pull request #1715 from AsparagusEduardo/pret_docBooleans
Documented boolean uses
|
2022-07-27 12:09:02 -04:00 |
|
|
GriffinR
|
5366e89258
|
Merge pull request #1713 from DizzyEggg/patch-1
Change GAME_LANGUAGE to LANGUAGE_ENGLISH
|
2022-07-26 11:08:05 -05:00 |
|
|
GriffinR
|
a8c93dcf35
|
Add missing font constants after EXT_CTRL_CODE_FONT
|
2022-07-18 02:36:25 -04:00 |
|
|
GriffinR
|
165f51a295
|
Merge pull request #1701 from GriffinRichards/faint-cmd-name
Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall
|
2022-07-16 08:15:54 -04:00 |
|
|
GriffinR
|
8898d84ced
|
Merge pull request #1708 from LOuroboros/sStartMenuItems
Linked MENU_ACTION constants to the items in sStartMenuItems
|
2022-07-15 09:22:35 -04:00 |
|
|
GriffinR
|
16ab534ddb
|
Add some missing pocket constant usage
|
2022-07-14 10:27:51 -04:00 |
|
|
GriffinR
|
f85b4699dc
|
Fix conditional in SpriteCB_DeoxysRockFragment
|
2022-07-12 21:29:36 -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 |
|
|
GriffinR
|
a359db6a8c
|
Merge pull request #1704 from LOuroboros/typeAbNameLength
Relocated TYPE_NAME_LENGTH and ABILITY_NAME_LENGTH
|
2022-07-11 22:49:29 -04:00 |
|
|
GriffinR
|
15f386ede6
|
Move make compare to its own build section
|
2022-07-08 01:34:38 -04:00 |
|
|
GriffinR
|
06dc93fc2f
|
Clean up field_poison.c
|
2022-07-06 21:04:54 -04:00 |
|
|
GriffinR
|
2c4c9497d2
|
Fix comment
|
2022-07-06 15:02:17 -04:00 |
|
|
GriffinR
|
e6a374f2b6
|
Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall
|
2022-07-06 14:49:08 -04:00 |
|
|
GriffinR
|
76659a4091
|
Merge pull request #1700 from mrgriffin/battle-setup-water-transition
Simplify GetBattleTransitionTypeByMap
|
2022-07-05 11:10:16 -04:00 |
|
|
GriffinR
|
8231ea2b68
|
Merge pull request #1699 from mrgriffin/field-camera-mod-16
Identify a % 16
|
2022-07-04 16:31:37 -04:00 |
|
|
GriffinR
|
650f033c2b
|
Merge pull request #1695 from GriffinRichards/update-gfromh
Update some GF rom header names
|
2022-06-29 11:59:43 -04:00 |
|
|
GriffinR
|
06c9e0eb99
|
Merge pull request #1697 from Kurausukun/bpm
Use Floats and Round Correctly in Tempo Calculation
|
2022-06-28 00:27:44 -04:00 |
|
|
GriffinR
|
8950a41bfd
|
Update some GF rom header names
|
2022-06-21 18:31:09 -04:00 |
|
|
GriffinR
|
c2a08cc84d
|
Merge pull request #1689 from GriffinRichards/task-ub
Remove UBFIX related to task destruction
|
2022-06-21 16:33:17 -04:00 |
|
|
GriffinR
|
a5291cbc10
|
Merge pull request #1694 from sphericalice/patch-1
Fix missing COPYWIN_FULL constant use
|
2022-06-19 11:54:29 -04:00 |
|
|
GriffinR
|
fa1ae45b39
|
Merge pull request #1692 from coltongit/script-fixes
Supplant PR #1579 (Fix the last of the *.inc inconsistencies)
|
2022-06-18 21:02:28 -04:00 |
|
|
GriffinR
|
21ed288f50
|
Merge pull request #1687 from SimplyBLGDev/patch-1
Format newlines in surf.inc
|
2022-06-18 11:04:39 -04:00 |
|
|
GriffinR
|
a931874164
|
Merge pull request #1691 from coltongit/patch-5
Format newline in BattleFrontier_BattlePikeLobby/scripts.inc
|
2022-06-18 11:04:20 -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
|
d11b04f251
|
Merge pull request #1690 from Kurausukun/ai_doc
Document Design Oddity, Use Constants, Correct Comment
|
2022-06-17 22:09:43 -04:00 |
|
|
GriffinR
|
7a6b417b8e
|
Remove UBFIX related to task destruction
|
2022-06-17 21:01:23 -04:00 |
|
|
GriffinR
|
de1145e790
|
Merge pull request #1688 from coltongit/patch-4
Add bugfix from bugs_and_glitches.md to BUGFIX
|
2022-06-17 17:48:53 -04:00 |
|
|
GriffinR
|
03e74c4aff
|
Merge pull request #1686 from SimplyBLGDev/patch-2
Format newlines in pc_transfer.inc
|
2022-06-17 13:37:57 -04:00 |
|
|
GriffinR
|
0e5fac564e
|
Merge pull request #1684 from SimplyBLGDev/patch-1
Format newlines in contest_string.inc
|
2022-06-17 11:20:20 -04:00 |
|
|
GriffinR
|
4660f8c88b
|
Document battle tower TV show
|
2022-06-14 09:37:39 -04:00 |
|
|
GriffinR
|
95f075ec90
|
Remove erroneous bugfix
|
2022-06-13 15:01:04 -04:00 |
|
|
GriffinR
|
dec54e6e92
|
Additional constant usage
|
2022-06-13 03:21:20 -04:00 |
|
|
GriffinR
|
6418f08944
|
Merge pull request #1679 from LOuroboros/ribbons
Untangled CheckPartnersMonForRibbons
|
2022-06-09 14:47:38 -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
|
ceaff148f7
|
Shift to multiply
|
2022-06-09 10:52:19 -04:00 |
|
|
GriffinR
|
89e6e11f4c
|
Merge pull request #1676 from GriffinRichards/obj-warning
Add warning to NUM_OBJ_EVENT_GFX
|
2022-06-05 21:19:39 -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 |
|
|
GriffinR
|
78b0c20738
|
Merge pull request #1674 from Sneed69/master
Include config.h in siirtc.c
|
2022-06-03 14:45:10 -04:00 |
|
|
GriffinR
|
817fcb1c34
|
Merge pull request #1673 from sphericalice/try-free-and-set-null
Use the TRY_FREE_AND_SET_NULL macro where appropriate
|
2022-06-03 11:07:38 -04:00 |
|
|
GriffinR
|
7bea8c58e7
|
Merge pull request #1672 from sphericalice/create-region-map-player-icon-arg-names
Correct CreateRegionMapPlayerIcon's argument names
|
2022-06-03 10:22:03 -04:00 |
|
|
GriffinR
|
a8437493c1
|
Document generic argument names in battle anim palettes
|
2022-06-01 12:25:01 -04:00 |
|
|
GriffinR
|
5e6d8a77e4
|
Document some generic argument names
|
2022-05-31 14:34:25 -04:00 |
|
|
GriffinR
|
a7b6dfee3a
|
Merge pull request #1669 from Bl4ckSh4rk/boolean
Use more TRUE & FALSE constants
|
2022-05-26 21:19:47 -04:00 |
|
|
GriffinR
|
b59fb7637a
|
Merge pull request #1668 from mrgriffin/static-assert-save-structs
Static assertion for size of save structs
|
2022-05-25 15:25:49 -04:00 |
|
|
GriffinR
|
2a6e57c082
|
Merge pull request #1667 from Sneed69/summary_enum
Document DrawPagination
|
2022-05-25 10:15:21 -04:00 |
|
|
GriffinR
|
12a0920c3b
|
Merge pull request #1666 from Sneed69/summary_enum
Minor summary screen clarification
|
2022-05-25 01:51:17 -04:00 |
|
|
GriffinR
|
09ea1c84f9
|
Merge pull request #1665 from Sneed69/master
Rename chanceCommon to chanceNotRare in SetWildMonHeldItem
|
2022-05-23 18:59:09 -04:00 |
|
|
GriffinR
|
0fb4163f20
|
Merge pull request #1664 from Sneed69/itemCommon_itemRare
Rename BaseStats.item1 and item2 to provide context
|
2022-05-23 17:12:10 -04:00 |
|
|
GriffinR
|
f756e60455
|
Merge pull request #1663 from GriffinRichards/castform-pal
Generalize usage of castformPalette
|
2022-05-21 23:45:01 -04:00 |
|
|
GriffinR
|
6d772a5e30
|
Merge pull request #1662 from GriffinRichards/door-gfx
Clean up door animations
|
2022-05-21 16:07:02 -04:00 |
|
|
GriffinR
|
c9c754be06
|
Merge pull request #1661 from GriffinRichards/fix-inconsistent-static
Fix inconsistent static s/g names
|
2022-05-20 19:38:02 -04:00 |
|
|
GriffinR
|
7f64bf58d6
|
Merge pull request #1660 from GriffinRichards/doc-contest-bar
Document Task_UpdateContestResultBar
|
2022-05-19 12:52:44 -04:00 |
|
|
GriffinR
|
91baf08638
|
Generalize usage of castformPalette
|
2022-05-18 22:11:51 -04:00 |
|
|
GriffinR
|
c2dc4a5dea
|
Some field door comments
|
2022-05-18 13:03:02 -04:00 |
|
|
GriffinR
|
5c8e1e81ea
|
Color single-palette door anim graphics
|
2022-05-18 12:41:20 -04:00 |
|
|
GriffinR
|
67d73ee36f
|
Clean up door animation functions
|
2022-05-17 17:13:29 -04:00 |
|
|
GriffinR
|
593e2c9be0
|
Fix inconsistent static s/g names
|
2022-05-17 14:00:02 -04:00 |
|
|
GriffinR
|
71ea78cc32
|
Document Task_UpdateContestResultBar
|
2022-05-16 15:01:06 -04:00 |
|
|
GriffinR
|
8a921bb680
|
Merge pull request #1659 from cbt6/step-functions
Use ARRAY_COUNT in sStepTimes for step functions
|
2022-05-15 10:19:06 -04:00 |
|
|
GriffinR
|
ed1cc203c6
|
Merge pull request #1654 from Kurausukun/better_dinfo
Don't Build Modern with -g by Default
|
2022-05-12 22:41:15 -04:00 |
|
|
GriffinR
|
1842af7570
|
Merge pull request #1655 from GriffinRichards/fix-berry-id
Fix math in CreateBerrySprite
|
2022-05-12 18:04:30 -04:00 |
|
|
GriffinR
|
2b223acd87
|
Fix math in CreateBerrySprite
|
2022-04-26 21:44:11 -04:00 |
|
|
GriffinR
|
ef4d99c87e
|
Merge pull request #1645 from acidghost/fix-find-libpng
Fix finding libpng in gbagfx and rsfont on macOS M1
|
2022-04-20 10:47:12 -04:00 |
|