Commit Graph

7527 Commits

Author SHA1 Message Date
GriffinR
b873d69679 Sync trade anim 2023-01-09 15:32:04 -05:00
GriffinR
c91b13a12b Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows 2023-01-07 13:30:11 -05:00
Eduardo Quezada
ca46c22533 Removed SpeciesInfo array defines 2023-01-04 08:14:34 -03:00
GriffinR
6d6a876dbd
Merge pull request #1820 from GriffinRichards/doc-wnews
Document wonder news
2023-01-03 22:34:58 -05:00
GriffinR
36c89d345c
Merge branch 'master' into doc-wnews 2023-01-03 22:28:21 -05:00
GriffinR
e88139d1b5 Add fix for Battle Tower cloning bug 2022-12-29 11:22:53 -05:00
GriffinR
8c61869638
Merge pull request #1835 from Jaizu/patch-29
Fix ANIM_SPRITE on regular builds with BUGFIX.
2022-12-29 10:17:57 -05:00
Jaizu
c40c7e7e65
Fix breaking modern, correct labels. 2022-12-29 16:11:17 +01:00
Jaizu
e2d47a07f5
Fix ANIM_SPRITE on regular builds with BUGFIX.
Dicussion about this being a BUGFIX define instead limiting it only to modern.
Credit SBird.
2022-12-29 12:28:44 +01:00
GriffinR
d02d518917
Merge pull request #1829 from AsparagusEduardo/pret/doc/SaveBlockPadding
Documenting padding in structs used by Saveblocks
2022-12-27 20:50:37 -05:00
GriffinR
a3d09af095
Merge pull request #1832 from AsparagusEduardo/pret/pr2/doc/summaryTypes
Added TYPE_ICON_SPRITE_COUNT to Summary documentation
2022-12-27 20:49:59 -05:00
GriffinR
0947e792bf
Merge pull request #1833 from SBird1337/doc/writesequencetobgtilemapbuffer
[doc] remove mislabled metatile attributes in bg.c
2022-12-27 20:49:38 -05:00
sbird
214718110a [doc] remove mislabled metatile attributes from WriteSequenceToBgTilemapBuffer 2022-12-27 15:38:13 +01:00
Eduardo Quezada
b0127428c6 Review suggestions. 2022-12-27 00:04:46 -03:00
Eduardo Quezada
701179eb1f Documented missing use of SPRITE_ARR_ID_MOVE_SELECTOR1 2022-12-26 21:05:18 -03:00
GriffinR
7355c9c1d7
Merge pull request #1831 from sphericalice/caught-icon-rename
Rename ball_display_unused_extra
2022-12-26 12:01:56 -05:00
SphericalIce
09d20bd634 Rename ball_display_unused_extra 2022-12-26 11:30:12 +00:00
GriffinR
7a480c0a87
Merge pull request #1830 from sphericalice/registered-item-none
Use the ITEM_NONE constant for the registeredItem save block field
2022-12-18 16:11:29 -05:00
SphericalIce
17052d4547 Use the ITEM_NONE constant for the registeredItem save block field 2022-12-18 21:05:37 +00:00
Eduardo Quezada
66d1c9bc65 Documenting padding in structs used by Saveblocks 2022-12-17 22:55:43 -03:00
GriffinR
2aa6a9c164 Remove two unreferenced metatile labels 2022-12-16 11:05:56 -05:00
GriffinR
347a02ace1 Sync trade 2022-12-15 15:40:59 -05:00
GriffinR
5c90df73ba
Merge pull request #1825 from AsparagusEduardo/pret/pr2/AnimationMacros
Species animation tables into macros
2022-12-10 10:00:34 -05:00
Eduardo Quezada
2f96344cd9 Removed ANIM_CMD macro from unused_anims.h 2022-12-10 11:46:41 -03:00
GriffinR
f87c5be45a
Merge pull request #1827 from SBird1337/fix/debugprint
[fix] DebugPrintf with no format arguments
2022-12-09 12:54:19 -05:00
sbird
0d5adac1e1 [debug, printf] add DebugPrintfLevel macro 2022-12-07 00:03:25 +01:00
sbird
fab26b99f1 [fix] DebugPrintf with no format arguments 2022-12-06 15:59:59 +01:00
Eduardo Quezada
2d694a84e3 Trying to fix remote reference 2022-12-05 21:57:28 -03:00
GriffinR
f55443656f Add NUM_TILES_PER_METATILE 2022-12-03 17:29:02 -05:00
GriffinR
dc24fde7f6 Sync calcrom fixes 2022-11-27 17:33:09 -05:00
GriffinR
e5260c9aa1
Merge pull request #1823 from tustin2121/patch-6
Use multi-include incbins for stormy_water animation
2022-11-27 12:26:52 -05:00
tustin2121
cf6f343726 Use multi-include incbins for stormy_water
- Removes a special case rule from the make files.
2022-11-26 23:38:39 -05:00
GriffinR
004ce32da0 Sync text ctrl codes with pokefirered 2022-11-23 21:13:00 -05:00
Eduardo Quezada
7999220361 Fixed modern compile 2022-11-22 18:37:38 -03:00
Eduardo Quezada
7327be6f9e Made Types and Egg Groups into arrays 2022-11-22 17:05:25 -03:00
GriffinR
483c3d5c13 Document wonder news 2022-11-22 02:17:03 -05: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
5fa364256d
Merge pull request #1808 from AsparagusEduardo/pret/PR/numSides
Introduce NUM_BATTLE_SIDES
2022-11-18 17:39:00 -05:00
GriffinR
df470b75dd
Merge pull request #1817 from GriffinRichards/sync-wireless
Add cursor kind constants, sync wireless improvements
2022-11-17 15:18:20 -05:00
GriffinR
601bb0b578 Index gBattleFrontierHeldItems 2022-11-10 16:14:06 -05:00
GriffinR
3b1c8dfb17 Update list menu graphics 2022-11-09 19:44:58 -05:00
GriffinR
e434b0047f More missing constant usage 2022-11-09 15:53:47 -05:00
GriffinR
431a7ef8dd Add missing cursorKind field usage 2022-11-09 15:37:47 -05:00
GriffinR
1d1c2d41bb Add list menu cursor constants 2022-11-09 15:16:46 -05:00
GriffinR
b3e75138da Sync wireless improvements 2022-11-09 15:14:18 -05:00
GriffinR
9e24fe6ec8
Merge pull request #1816 from LOuroboros/patch-1
Fixed indentation in ScrCmd_faceplayer
2022-11-08 19:07:34 -05:00
LOuroboros
a35986fd9c Fixed indentation in ScrCmd_faceplayer 2022-11-08 21:01:50 -03:00
tustin2121
33f3a7c11a Adding FindObjectEventPaletteIndexByTag bugfix
The code in event_object_movement.c indicates that OBJ_EVENT_PAL_TAG_NONE was meant to be a sentinel for the bottom of each of the tables involving palettes in there. sObjectEventSpritePalettes is the exception, but the functions that access it look for OBJ_EVENT_PAL_TAG_NONE even though it's not in the table. If the palette tag isn't in the table, the functions which scan it fall off the bottom of the table into an infinite loop of scanning 256 "entries" of the table (because it uses a u8 index), and the game locks up. In vanilla, the search simply never falls off the bottom of the table. It seems the developers intended for that last entry to be {NULL, OBJ_EVENT_PAL_TAG_NONE}.
2022-11-07 06:09:21 -05:00
GriffinR
0a6de12b5e
Merge pull request #1814 from AsparagusEduardo/pret/pr/storageDoc
Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System
2022-11-06 23:35:53 -05:00
Eduardo Quezada
237877e21b Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System 2022-11-07 00:00:23 -03:00