foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-23 06:58:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
2305 commits 2 branches 0 tags 30 MiB
Commit graph

2305 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
a5375a0805 Factor out graphics INCBINs from main.asm to gfx/*.asm 2020-07-03 17:43:55 -04:00
Rangi
64da1f5d6b Move graphics-only object file sources into gfx/ 
Previously this wasn't working, but now the Makefile uses pokegold's technique for running scan_includes.

It also enables and fixes some rgbds warnings ("Non-local labels without a colon are deprecated").
 2020-07-03 17:32:21 -04:00
Rangi
62e137f6ce Factor out data/sprites/ 2020-07-03 16:58:55 -04:00
Rangi
962722746e tilesets.asm -> tileset_constants.asm 2020-07-03 16:45:00 -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
e882708b85 Split up engine/events/hidden_object_functions 2020-07-03 13:23:51 -04:00
Rangi
6bd86e10c3 Reorganize home header 2020-07-03 13:03:21 -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
91dc3c9f9c Remove unused Yellow music 2020-07-03 11:52:16 -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
c85050497c
Merge pull request #256 from Rangi42/master 
Add subdirectories to engine/ similar to pokecrystal
 2020-07-03 09:38:52 -04:00
Rangi
87ef75c173 Add engine/movie/oak_speech/ subdirectory 2020-07-03 01:11:23 -04:00
Rangi
881e005970 INCLUDE "engine/pokemon/bills_pc.asm" in main.asm, not audio.asm 2020-07-03 01:09:58 -04:00
Rangi
f275790aec Add subdirectories to engine/ similar to pokecrystal 2020-07-02 23:30:21 -04:00
Rangi
5559d51c86 Actually run .travis/webhook.sh 2020-06-28 20:26:44 -04:00
Rangi
c1512d39a7 Add Travis webhook for tools/unnamed.py 2020-06-28 20:23:26 -04:00
Rangi
35a09298a6 Use --preserve instead of a hard-coded blank tile 2020-06-28 20:05:17 -04:00
Rangi
f887cf3ee0 Update tools/gfx to support --preserve 2020-06-28 20:00:58 -04:00
Rangi
85d8a8d587
Merge pull request #254 from Rangi42/master 
Remove RAM address comments, and add original Red/Green graphics
 2020-06-28 00:56:33 -04:00
Rangi
2ebbb0d95e Add original Red/Green SGB border and slot machine graphics 2020-06-28 00:17:10 -04:00
Rangi
e71e28a1ee Add original Red/Green tileset graphics which differ from Red/Blue 
This is just for convenience, like the Red/Green Pokémon front sprites.
 2020-06-27 23:40:23 -04:00
Rangi
929c7f6f7d Remove RAM address comments 2020-06-27 23:03:39 -04:00
Rangi
5650595807
Merge pull request #253 from Rangi42/master 
Individual images for party menu icon graphics
 2020-06-27 22:46:52 -04:00
Rangi
6b19b301f4 Move trade bubble from gfx/icons to gfx/trade 2020-06-27 22:44:05 -04:00
Rangi
2d562a673b Factor out shared audio/notes.asm 2020-06-27 22:24:13 -04:00
Rangi
eeb45036e2 Individual images for party menu icon graphics 2020-06-27 22:16:01 -04:00
Rangi
76d02feca0 Move mon_nest_icon.png to gfx/town_map 2020-06-27 21:43:32 -04:00
Rangi
6a1e077d2d Travis builds with rgbds 0.4.0 from source 2020-06-27 21:43:32 -04:00
Rangi
412d3c7a92 Create .map files, and don't sort .sym files since rgbds 0.4.0 does that 2020-06-27 21:43:32 -04:00
Rangi
209ecc1919 Merge pic/ into gfx/ 2020-06-27 21:43:32 -04:00
Rangi
77df64ba9c Fix the slot machine tilemap, and adjust the slot graphics 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
Daniel Harding
ff927ba730
Merge pull request #250 from Rangi42/master 
Move more tables from engine/ to data/
 2020-06-23 19:06:14 -05: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
Daniel Harding
bdeb494add
Merge pull request #243 from Nog-Frog/rename-unused-cd40 
Name UnusedCD40
 2020-06-21 12:23:10 -05:00
Daniel Harding
9dc71c771e
Merge pull request #246 from Akatsuki-py/SubtractAmountPaidFromMoney 
fix SubtractAmountPaidFromMoney comment
 2020-06-14 14:41:32 -05:00
Akatsuki-py
a3b6d69efc remove two whitespaces 2020-06-06 10:50:05 +09:00
Akatsuki-py
09f07502b3 fix SubtractAmountPaidFromMoney comment 2020-06-05 04:32:12 +09:00
Daniel Harding
dfe718d99e
Merge pull request #245 from Nog-Frog/small-changes 
Change wGrassRate to wLinkEnemyTrainerName
 2020-06-02 09:34:52 -05:00
Nog-Frog
9c01ebc147 Change wGrassRate to wLinkEnemyTrainerName 2020-06-02 12:39:06 +03:00
dannye
20a3d84396 Replace hard-coded value of CRY_SFX_START 2020-05-29 17:30:15 -05:00
Nog-Frog
7ecfd641fb Name UnusedCD40 
Every man deserves a name :)
 2020-05-29 10:07:53 +03:00
Daniel Harding
50963770f3
Merge pull request #242 from Akatsuki-py/fix_CopyDataUntil 
fix comment in CopyDataUntil
 2020-05-27 14:36:35 -05:00
Daniel Harding
6119945fca
Merge pull request #241 from Nog-Frog/Fix-Sent-To-Box 
Change "Set to box" to "Sent to box"
 2020-05-27 14:34:34 -05:00
Daniel Harding
d29d0224e5
Merge pull request #239 from Akatsuki-py/use_rept 
Use rept macro in CopyHealingMachineOAM
 2020-05-27 14:34:06 -05:00