Leahnaya/pokeyellow
1
0
Fork 0
mirror of https://github.com/pret/pokeyellow.git synced 2026-04-26 09:42:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,618 Commits 2 Branches 0 Tags 32 MiB
master
Commit Graph

546 Commits

Author SHA1 Message Date
Rangi
52660012c6 Clean up some redundant or unusual event comments 2021-10-05 20:46:46 -04:00
dannye
94ed208164 Merge branch 'master' of https://github.com/pret/pokered 2021-09-26 22:56:02 -05:00
dannye
501a21fa5d Merge branch 'master' of https://github.com/pret/pokered 2021-09-26 22:43:09 -05:00
Rangi
d48a318dbf Align object_event coordinates 
Fixes #336
 2021-09-26 23:20:57 -04:00
Yoann Fievez
2c4f35848b
Unify map event gen1 gen2 (#335) 
* Update sign to bg_event #289

* Rename warp to warp_event

* Replace object to object_event

* Move warp macro parameter from warp x, y, id, map to warp_event x, y, map, id
 2021-09-26 21:56:09 -05:00
Rangi
7ee8a6509e wcf4b -> wStringBuffer 2021-08-28 17:02:20 -04:00
Rangi
7d4ec90538 Some miscellaneous changes, syncing more with pokered 2021-05-31 19:40:14 -04:00
dannye
7a23e2a635 Merge branch 'master' of https://github.com/pret/pokered 2021-05-31 16:51:45 -05:00
Daniel Harding
47c2d1a1a5
Merge pull request #324 from KqesaR/clean_label_wild_map_pointer 
Standardize names of wild maps entities
 2021-05-31 12:16:54 -05:00
Yoann Fievez
dfc81962d2 Fix typo noting to nothing and align vertically comments 2021-05-31 18:49:02 +02:00
Rangi
d53e450c98 Merge remote-tracking branch 'remotes/pokered/master' 2021-05-31 12:40:26 -04:00
Rangi
7b2eb6b252 Simplify the tileset headers 2021-05-31 12:37:15 -04:00
Daniel Harding
ea5c9f9e05
Merge pull request #322 from SatoMew/master 
Identify the connections between Routes 22 and 23 as unused
 2021-05-31 11:20:24 -05:00
Rangi
1e58df98af Improve some RAM formatting 2021-05-31 11:46:13 -04:00
Rangi
8701ef4d61 Improve some RAM formatting 2021-05-31 11:46:10 -04:00
Rangi
b3eadb3508 Merge remote-tracking branch 'remotes/pokered/master' 2021-05-30 17:34:50 -04:00
Rangi
ce62dca69b Eliminate unnecessary data macros 2021-05-30 17:28:26 -04:00
Rangi
bb9c72cbc5 Merge remote-tracking branch 'remotes/pokered/master' 2021-05-23 22:36:18 -04:00
Rangi
223b7b21a4 Add labels to unreferenced mart inventories and remove redundant comments 2021-05-23 22:35:28 -04:00
Rangi
198795bbb0 Merge remote-tracking branch 'remotes/pokered/master' 2021-05-23 22:09:45 -04:00
Rangi
346ce9454a Use macros for bit arrays 2021-05-23 22:09:02 -04:00
Rangi
b11b9e0968 Merge remote-tracking branch 'remotes/pokered/master' 2021-05-23 18:37:43 -04:00
Rangi
653b62139d Use macros for packed arrays of nybbles 2021-05-23 18:33:14 -04:00
Yoann Fievez
3b76c590da Standardize names of wild maps entities 
Standardize the name of entities of maps for wild pokemon
 2021-05-18 20:58:24 +02:00
SatoMew
d966193d7b Change terminology as per feedback 2021-05-08 23:20:52 +01:00
SatoMew
b3364f9f88 Identify the connections between Routes 22 and 23 as unused 2021-05-08 13:24:33 +01:00
dannye
d4154b2891 Merge branch 'master' of https://github.com/pret/pokered 2021-04-17 21:00:28 -05:00
Rangi
dd690920c9 Use rgbds 0.5.0 features: 
- FOR loops
- {interpolation}
- REDEF EQUS
- \# for all macro args
 2021-04-17 19:06:56 -04:00
dannye
82edc61dda Fix Route20 wild mons tables 2021-03-25 18:05:18 -05:00
Rangi
2baf0ae962 Forgot to end_water_wildmons 2021-03-25 18:58:53 -04:00
dannye
eb47bda8ee Merge branch 'master' of https://github.com/pret/pokered 2021-03-25 17:39:44 -05:00
Rangi
95ec2cf039 Verify data table and name list sizes with assertion macros 
Fixes #312
 2021-03-25 16:44:41 -04:00
Rangi
e1f6bb5393 Remove unused _GREEN TitleMons data 2021-03-21 18:39:01 -04:00
Rangi
a42568278b Merge remote-tracking branch 'remotes/pokered/master' 2020-12-20 23:37:15 -05:00
Rangi
21908ba30a Clarify signed magnitude in the growth_rate macro 2020-12-20 23:35:42 -05:00
dannye
2654da5d15 Merge branch 'master' of https://github.com/pret/pokered 2020-12-15 11:05:12 -06:00
SatoMew
6b8ddb6beb Clearer tileset header macro comment 2020-12-02 00:37:43 +00:00
SatoMew
0064806384 Fix outdated comments 2020-12-01 22:33:03 +00:00
SatoMew
3756ec6dd9 Improve new constants and comment based on feedback 2020-11-29 22:07:26 +00:00
SatoMew
083cb38e33 Update related tile animation constants 2020-11-29 21:28:38 +00:00
Rangi
47cd734276 Use assert to ensure correct base data size 2020-11-17 16:27:44 -05:00
dannye
48dc6a8cf4 Merge branch 'master' of https://github.com/pret/pokered 2020-11-14 21:54:23 -06:00
dannye
66377fca32 Fix file modes 2020-11-14 20:52:10 -06:00
Rangi
b88572fbcc Add constants for player and rival starters 2020-11-13 11:10:03 -05:00
dannye
ead36b7ba2 Fix typo 2020-11-07 21:12:03 -06:00
dannye
453107ab8a More debug yellow 
only debug menu left
 2020-11-07 14:35:40 -06:00
Rangi
4efb3e307c Sync more with pokered 2020-11-06 10:34:05 -05:00
Rangi
13d4d533f7 Sync more with pokeyellow 2020-11-06 10:33:58 -05:00
Rangi
ed7a2d49d7 Remove trailing whitespace 2020-11-05 15:17:48 -05:00
Rangi
2a4b8b5a24 Remove trailing whitespace 2020-11-05 15:17:39 -05:00
Rangi
472f5824a6 Sync more with pokered 2020-11-05 15:15:37 -05:00
Rangi
e37300a446 Syn base stats' tmhm formatting with pokered 2020-11-05 11:22:34 -05:00
Rangi
5d57fec783 Remove unused RG/RB graphics 2020-11-05 11:04:52 -05:00
Rangi
aae999f72b Start reorganizing pokeyellow 2020-11-04 19:44:31 -05:00
dannye
5647ca687b Sync with pokered 2020-11-04 00:06:44 -06:00
Rangi
bc287b9b80 Some formatting changes 2020-10-19 20:26:35 -04:00
Rangi
5ebae4747b PedalDanceAnim -> PetalDanceAnim 2020-10-08 18:55:19 -04:00
Rangi
df144ec5f3 Pan Docs: "When sending three or more data sets, data is continued in further packet(s). Unused bytes at the end of the last packet should be set to zero." 2020-09-01 12:19:24 -04:00
Rangi
1143019ac6 Separate the two lists of unused names 2020-08-31 19:01:13 -04:00
Rangi
bfd9f617c9 Use constants to delineate map types, and factor out more data 2020-08-31 10:23:19 -04:00
Rangi
70eac3a1f7 Factor out data/tilesets/pair_collision_tile_ids.asm 2020-08-30 23:22:39 -04:00
Rangi
6ee9cb9f97 Document more hidden object data and behavior 2020-08-30 15:45:41 -04:00
Rangi
407b813250 Separate splash screen, intro, and credits (like pokegold/pokecrystal) 2020-08-28 09:54:57 -04:00
Rangi
48da6c53be Align warp and sign coordinates 2020-08-21 12:04:49 -04:00
Rangi
4373aafac1 Use def_warps_to macro for automatic warp_to entries 2020-08-17 18:08:54 -04:00
Rangi
f4514ff53c Use map constants for SilphCoElevator warps 2020-08-17 17:40:27 -04:00
Rangi
e2c99f1910 Use def_* macros for automatic map event counts 2020-08-17 16:54:59 -04:00
Rangi
2fe1505bab Use ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects 2020-08-17 14:25:11 -04:00
Rangi
f82097b894 Identify some map object related constants 2020-08-17 14:22:27 -04:00
Rangi
3b003960d4 Fix Town Map coordinates to be in (X, Y) order as comments claim 2020-08-17 13:40:20 -04:00
Rangi
33ea73496a Fix encounter rate comments 2020-08-02 01:10:24 -04:00
Akihiro Otomo
b48bbbb047
fix OAMFLAG_VFLIPPED (#283) 
Replace incorrect label OAMFLAG_VFLIPPED with OAM_HFLIP
 2020-08-02 00:31:10 -04:00
Rangi
69788c536b Add comments associating constants with data, and identify some more data 2020-07-20 12:31:35 -04:00
Rangi
df62b8e81a Missingno's Pokédex weight is two bytes like the rest 2020-07-19 16:45:39 -04:00
Rangi
7619b01dd7 Reformat key item bit fields 2020-07-18 14:19:08 -04:00
Rangi
76289dfda0 Port dbsprite macro for OAM y,x,tile,attr data from pokecrystal 2020-07-17 15:58:06 -04:00
Rangi
f53341efa1 Define constants for subanimations' base coords and frame block modes 2020-07-17 15:16:54 -04:00
Rangi
72a0e98c93 JUGGLER_X -> UNUSED_JUGGLER 2020-07-17 13:56:59 -04:00
Rangi
3c1cdbc4d0 Identify remaining tilemap IDs 2020-07-17 13:47:33 -04:00
Rangi
30ecbf6ea3 SONY -> RIVAL 2020-07-17 13:27:27 -04:00
Rangi
2454296d32 Update sprite names 
These are based on the trainers that use them, and synced with pokegold/pokecrysal when possible
 2020-07-17 12:48:15 -04:00
Rangi
44b424353d Factor our frame blocks' base coordinates 2020-07-16 22:40:48 -04:00
Rangi
4cc4b175fc Identify trade-related tilemaps 2020-07-16 22:30:40 -04:00
Rangi
884ef9c1a8 Factor out animation tilemaps 2020-07-16 22:23:31 -04:00
Rangi
6f7337bbb1 Define constants for subanimation transform types 2020-07-16 22:14:39 -04:00
Rangi
41a9e30268 Add constants for move animations' frame blocks 2020-07-16 22:00:16 -04:00
Rangi
2f43a41100 Use a battle_anim macro for move animations' special effects and subanimations 
Move animations' sound IDs are off by one from move IDs.
 2020-07-16 21:45:30 -04:00
Rangi
cd71ae03af Separate move/battle animation data from move data (to do: further identify animation data labels+constants) 2020-07-16 19:50:48 -04:00
Rangi
b9a113a9f4
Merge pull request #276 from TheFakeMateo/master 
Deobfuscate exit warps on indoor maps
 2020-07-16 08:19:51 -04:00
TheFakeMateo
4ecff22f71 Deobfuscate exit warps on indoor maps 2020-07-15 18:12:58 -05:00
Rangi
4b4ad9894e Disassemble the BLUEMONS.GB debug ROM 2020-07-15 13:35:39 -04:00
Rangi
254f26bf6b Align constant comments as a column 2020-07-15 12:45:17 -04:00
Rangi
15bcd88228 Indent comments that describe data table macro formats 2020-07-15 12:39:50 -04:00
Rangi
be326c6565 Factor out spinner tiles from RocketHideoutB2F since they're also used by ViridianGym, and to make their data and code more accessible 2020-07-14 15:14:32 -04:00
Rangi
fcb573f4ac Use a macro for warp tile IDs, like other tile behaviors 2020-07-14 14:33:16 -04:00
Rangi
eb1ca5813b Define cries with a mon_cry macro 2020-07-14 14:20:38 -04:00
Rangi
f37cf959c9 Clean up some data, using macros for multiline list entries 2020-07-14 13:32:09 -04:00
Rangi
a49ca6ef41 Factor out MapBadgeFlags and EscapeRopeTilesets data tables 2020-07-08 10:31:44 -04:00
Rangi
4a7d1513f3 Use 'tile' and 'tiles' macros 2020-07-07 16:21:26 -04:00
Rangi
bbc257476f PSYCHIC -> PSYCHIC_TYPE (PSYCHIC is ambiguous with PSYCHIC_M) 2020-07-07 10:54:05 -04:00
Rangi
453bb5c38e Use STARTER[123] constants in TitleMons 2020-07-06 20:35:59 -04:00
Rangi
8a79315635 Capitalize rgbds control structures (EQU/EQUS, IF/ELIF/ELSE/ENDC, REPT/ENDR, MACRO/ENDM, etc) 2020-07-06 12:28:31 -04:00
Rangi
d08eb86233 Automatically list all TM##_MOVE and HM##_MOVE values 2020-07-06 12:22:20 -04:00
Rangi
6ad4c26a03 Align tmhm learnsets in rows of 5 2020-07-06 11:19:53 -04:00
Rangi
25a3e67b94 add_tm and add_hm define TM##_MOVE and HM##_MOVE constants, to avoid repeating the move names twice 2020-07-06 09:32:55 -04:00
Rangi
405889193e TM/HM constants named after moves 2020-07-05 22:52:27 -04:00
Rangi
66ebe56adc Port pokecrystal's base data and tmhm structure 
To do: TM/HM constants named after moves
 2020-07-05 21:59:32 -04:00
Rangi
a77999f7f1 Logical spacing in data/sgb/sgb_palettes.asm 2020-07-05 16:15:01 -04:00
Rangi
6137f5accb Port and improve hidden_object macro from pokeyellow 2020-07-05 15:57:07 -04:00
Rangi
b2369b0961 Port credits command constants from pokeyellow 2020-07-05 15:35:38 -04:00
Rangi
d9db3d7495 Update map hide/show data labels 
Fixes #235
 2020-07-05 14:38:08 -04:00
Rangi
139a28ff99 Port pokecrystal's formatting of text commands and special characters 2020-07-04 21:14:46 -04:00
Rangi
e4e0af4d67 Remove remaining raw $xxxx values, and replace "+ -1" with "- 1" (supported by rgbds 0.4.0) 2020-07-04 01:00:45 -04:00
Rangi
cdfab2e819 Document why Mew is set apart 2020-07-03 23:19:59 -04:00
Rangi
f9dc42a740 Factor out Mew's pics and base data 2020-07-03 22:59:12 -04:00
Rangi
053afc4634 Move more code from home.asm to home/ 2020-07-03 22:57:43 -04:00
Rangi
6ef36800b0 Replace raw hex values with HRAM constants 
To do: turn constants into labels and use ldh
 2020-07-03 22:22:09 -04:00
Rangi
55bb99580e data/mapHeaders -> data/maps/headers; data/mapObjects -> data/maps/objects 
To do: Polished Map support for loading the objects
 2020-07-03 18:19:56 -04:00
Rangi
62e137f6ce Factor out data/sprites/ 2020-07-03 16:58:55 -04:00
Rangi
9878f01e29 Organize macros/ like pokecrystal 
While doing so I replaced the StopAllMusic macro with a SFX_STOP_ALL_MUSIC constant and applied it throughout the code.
 2020-07-03 16:37:47 -04:00
Rangi
ccb01731fe Make suggested edits: 
- data/mapWilds -> data/wild/maps
- diglett_sculpture.asm -> book_or_sculpture.asm
- relocate some audio/music constants
 2020-07-03 15:57:35 -04:00
Rangi
710c3275fc Simplify map connections 
To do: Polished Map support for detecting the tileset
 2020-07-03 15:49:12 -04:00
Rangi
c9c59dc343 Reorganize constants/ 
To do: add comments associating constants with data and code
 2020-07-03 12:44:47 -04:00
Rangi
b29e5ee203 Add subdirectories to data/ similar to pokecrystal 
Top level text/ is now solely for the former text/maps/ files, and other files are in their respective subdirectories in data/.
 2020-07-03 11:51:00 -04:00
Rangi
f275790aec Add subdirectories to engine/ similar to pokecrystal 2020-07-02 23:30:21 -04:00
Rangi
eeb45036e2 Individual images for party menu icon graphics 2020-06-27 22:16:01 -04:00
Rangi
209ecc1919 Merge pic/ into gfx/ 2020-06-27 21:43:32 -04:00
Rangi
e770ee77ce Replace .tilecoll files with tile ID db data 2020-06-27 21:43:32 -04:00
Rangi
d5089d3c62 Organize gfx/ 2020-06-27 21:43:32 -04:00
Rangi
4b853ad676
Separate maps.asm, pics.asm, sprites.asm, and tilesets.asm from main.asm (#251) 
Each new file builds its own .o, along with separate main.o and home.o, which necessitates many more "exported::" labels.
 2020-06-27 15:32:24 -04:00
Rangi
0a62d48df2 Move more tables from engine/ to data/ 
This also splits the end of engine/battle/core.asm into engine/battle/effects.asm.
 2020-06-23 17:50:50 -04:00
dannye
10f9559eab Sync with pokered 2020-05-20 20:02:53 -05:00
Shakib2001
dc503346ca Removed EVENT_DISP 2020-03-27 15:01:14 -04:00
Shakib2001
3d8e949d37 Added warp, warp_to and sign compatibility 2020-03-27 14:31:38 -04:00
Celeste Brault
013ae78d74 Update tools 2019-06-10 19:07:44 -06:00
SatoMew
df2a68d6de Replace the few instances of Unknown Dungeon with Cerulean Cave 2019-04-08 18:47:31 +01:00
Rangi
c779602459 Rename map files, labels, and constants to be consistent and work with Polished Map 2019-01-01 23:33:10 -05:00
Pokeglitch
9b6f57832e Another map header fix 2018-07-28 15:56:50 -04:00
Pokeglitch
ae2c1036ea Fixed some map header files 2018-07-28 15:51:17 -04:00
Daniel Harding
c9da8510c8
Merge pull request #187 from Rangi42/master 
Document MissingNo's base stats, and silence an rgbds warning
 2018-07-15 21:45:22 -05:00
Daniel Harding
929c65f805
Merge pull request #188 from snelson3/consistent-map-header-comments 
make comments consistent throughout all mapHeader files
 2018-07-15 21:44:14 -05:00
Sam Nelson
ee72316102 make comments consistent throughout all mapHeader files 2018-07-15 10:50:44 -07:00
Rangi
462088a25c Document the origin of MissingNo's base stats. 2018-07-08 16:25:39 -04:00
Urs-Bjoern Schmidt
b4ab6dc701 Fixed some inconsistencies in the usage of the if-def directive. 2018-07-02 11:34:11 +02:00
dannye
8836e3e516 Fix malformed lists 
from 8b82d13dd5
 2018-04-22 14:23:11 -05:00
yenatch
5c4397c899 spaces in EvosMoves 2018-03-22 23:20:55 -04:00
yenatch
bd35b37262 use constants for wEvosMoves size 2018-03-22 23:09:49 -04:00
bitman44
2056bdda52 Cleaned up name formatting 2018-03-21 06:51:03 -05:00
bitman44
8251c6138e Replaced instances of Mon### with the Pokemon's name 2018-03-20 20:27:28 -05:00
Remy Oukaour
2e0183fc27 Block IDs use hex; zero connections use dec 2018-01-29 11:46:45 -05:00