Commit Graph

4705 Commits

Author SHA1 Message Date
Rangi
145efc1353 Use constants for screen size in metatiles 2018-04-04 16:14:48 -04:00
Rangi
aec3802587 Use 'elif' more 2018-04-04 14:06:25 -04:00
mid-kid
81fff9bb80 Fix file permissions
I have no idea why this was a thing (do people store this repo on FAT32
flash drives or something?), but quite a bit of files had a permission
of 755. This isn't really a problem, but it's inconsistent and weird.
2018-04-01 17:05:10 +02:00
mid-kid
91a768b243 Update file paths in constants/ and docs/ 2018-04-01 17:01:51 +02:00
mid-kid
05ba221eb5 flagpredef.asmsmallflag.asm 2018-03-25 19:14:26 +02:00
mid-kid
be76ee56a8 Organize the engine/ directory, director's cut
Cleaned up `engine/routines`, in favor of moving files into more
appropriate directories. predef-related routines are now in top-level
`engine`.
`rtc/delete_save_change_clock.asm` has been split into both
`menus/delete_save.asm` and `rtc/reset_password.asm`.

Made a new subdirectory:
* engine/math: Contains all generic math-related routines.
2018-03-25 18:24:14 +02:00
Rangi
7676f7d22e Merge branch 'master' of https://github.com/pret/pokecrystal 2018-03-25 11:38:24 -04:00
yenatch
0c446367ce
Merge pull request #500 from yenatch/fix-scan-includes
Fix scan_includes matching the word "include" in strings.
2018-03-25 11:19:59 -04:00
mid-kid
0d9241889f Organize the engine/ directory, take 3
Renamed `title` to `movies`.
Moved some functions from `engine/routines/` to their fitting
directories, and cleaned up the base `engine/` directory.
Moved `engine/pokemon/tmhm.asm` back to `engine/items/`.

Made a new subdirectory:
* engine/tilesets: Contains all map-related graphics routines.
2018-03-25 16:18:33 +02:00
Rangi
0447ee0cf9 Relabel some map-related WRAM
wMisc -> {wSurroundingTiles, wBoxPartialData, wLink_c608}
wOverworldMap -> {wOverworldMapBlocks, wHallOfFamePokemonList}
2018-03-19 11:36:14 -04:00
mid-kid
60e21a8663 Move init_gender and intro_menu to menus
They are actually some kind of menus, and as such make sense there.
2018-03-14 13:38:36 +01:00
mid-kid
97c511cd2f Organize the engine/ directory, take 2
Renamed `game` to `games` and `menu` to `menus`.
Moved some functions from `engine/routines/` to their fitting subdirectories.

Made two new subdirectories:
* engine/rtc: Contains all RTC-related things. Menus, hardware, misc
functions.
* engine/items: Contains all item-related things. Pack, item effects,
other item handlers.
2018-03-14 13:28:36 +01:00
mid-kid
baa0dc5a96 Organize the engine/ directory
This is an informed attempt at reorganizing the engine/ directory by
creating categorized subdirectories, in order to make it easier to
navigate and find things.

The directories created are as follows:
* engine/game: Contains all "minigames", things like the unown puzzle
and slot machine.
* engine/gfx: Contains all handling of graphics. From loading palettes
to playing animations.
* engine/link: Contains all multiplayer functionality.
* engine/menu: Contains all generic/misc. menus and menu code.
Other, more specialized menus are in their own subdirectories (pokedex,
pokegear, party menu, etc).
* engine/overworld: Contains all handling of the overworld. From loading
and connecting maps to wild encounters and the scripting engine.
* engine/pokegear: In the same vein as engine/pokedex, except it could
use some more splitting up.
* engine/pokemon: Contains everything related to manipulating pokemon
data. From the pokemon storage system to evolution and mail.
* engine/printer: Contains everything related to printing things as well
as the printer communication.
* engine/title: Contains intro sequences, title screens and credits.
2018-03-13 13:21:40 +01:00
yenatch
8efa0dcfb0 Fix scan_includes matching the word "include" in strings. 2018-03-10 18:20:31 -05:00
yenatch
12070ca500
Merge pull request #496 from Rangi42/master
Label more map scripts; document more bugs [ready to merge]
2018-03-10 16:16:03 -05:00
yenatch
b2f5362ec3
Merge pull request #499 from surskitty/master
A few labels
2018-03-10 16:14:58 -05:00
yenatch
4e4d9c9083 Merge remote-tracking branch 'surskitty/master' into master 2018-03-10 16:10:00 -05:00
surskitty
96dcc3c0ca Labels, labels. 2018-03-07 22:27:35 -05:00
surskitty
55c69c4871 Sprout Tower labels 2018-03-07 22:13:24 -05:00
surskitty
1de25bc957 Labelling Erika and Celadon Gym 2018-03-07 22:05:14 -05:00
Rangi
ab2677277e 201 -> 200 2018-03-04 02:30:31 -05:00
Rangi
159a0ef7b4 Bug docs match code 2018-03-04 02:29:39 -05:00
Rangi
7e9dbde549 HOF_MASTER_COUNT EQU 200 2018-03-04 00:27:22 -05:00
surskitty
1494c79688 Labelling Whitney texts 2018-03-02 21:39:29 -05:00
Rangi
bde9ffff6e Improve some code labels 2018-03-02 19:39:16 -05:00
Rangi
fb2ac9e210 Remaining map labels: UnknownText and MovementData 2018-03-01 17:33:43 -05:00
Rangi
2b40a1fb9c Label more map scripts (no more UnknownScripts) 2018-03-01 17:17:08 -05:00
Rangi
ae5a325464 Label more map scripts 2018-03-01 14:20:27 -05:00
Rangi
cad029f936 Label more map scripts 2018-03-01 13:18:51 -05:00
i0brendan0
51bbfee891
Reflect Rangi's suggestion 2018-03-01 04:06:46 -06:00
i0brendan0
82ffb584c8 Add Protect Bug and Fix
Moves 'miss' when opponent uses Protect.
2018-03-01 04:08:54 -06:00
Rangi
0680bf99d3 Label more map scripts 2018-02-28 17:47:31 -05:00
Rangi
5a6e43e72a Label more map scripts 2018-02-28 16:50:43 -05:00
Rangi
208ccecd84 "; unused" comments 2018-02-27 19:47:30 -05:00
Rangi
43b5f90457 Replace "Map<MapName>Signpost<#>Script" labels 2018-02-27 19:33:38 -05:00
Rangi
e2c15b0b92 * BillPhoneGeneriText -> BillPhoneGenericText
* data/phone/text/trainers1.asm -> data/phone/text/trainers.asm
* ,ROM -> , ROM0
2018-02-26 22:29:09 -05:00
Rangi
f0b01a4eea Document more quirks and bugs 2018-02-26 13:41:48 -05:00
Rangi
7df5d4f25e Address @SatoMew's comment re: #491 2018-02-26 11:56:49 -05:00
Rangi
5959548c01 Document HOF Master bug (close #494) 2018-02-26 11:51:16 -05:00
i0brendan0
b57bafd3b7 revert 2018-02-26 02:34:25 -06:00
yenatch
725148443f
Merge pull request #476 from Rangi42/master
Resolve some issues; rename some maps; move more tables into data/; warp_def → warp_event (ready to merge)
2018-02-25 22:39:51 -05:00
Rangi
7453bd1aa8 "HUMANSHAPE, aka Humanshape" 2018-02-25 22:38:09 -05:00
Rangi
711e2d6143 Mention unused Battle Tower-related text (resolves #491) 2018-02-25 22:33:07 -05:00
Rangi
9a7da21006 Mention "HAUNTED HOUSE" (resolves #492) 2018-02-25 22:25:32 -05:00
Rangi
b254a4571d ENGINE_BUG_CONTEST_ON -> ENGINE_MAIN_MENU_MOBILE_CHOICES (resolves #490)
Went with CHOICES instead of HIDDEN since setting the flag would presumably have shown the items, not hidden them
2018-02-25 22:23:20 -05:00
Rangi
2f9a0d7d9f Pokecom Center Admin Room -> Office 2018-02-25 22:19:17 -05:00
Rangi
409fd9d33f Comment Stadium 2 alternative egg group names 2018-02-25 22:11:32 -05:00
Rangi
335c2699f0 Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
#	constants/map_constants.asm
#	constants/wram_constants.asm
#	data/radio/oaks_pkmn_talk_routes.asm
#	data/radio/pnp_hidden_places.asm
#	engine/battle/core.asm
#	engine/breeding.asm
#	engine/phone/phone_scripts.asm
#	engine/radio.asm
#	maps/BattleTower1F.asm
#	maps/OlivineLighthouse2F.asm
#	maps/OlivineLighthouse6F.asm
#	maps/PokemonFanClub.asm
#	maps/RadioTower1F.asm
#	maps/RadioTower2F.asm
#	maps/Route30BerryHouse.asm
#	maps/Route34IlexForestGate.asm
#	maps/Route36NationalParkGate.asm
#	maps/RuinsOfAlphKabutoChamber.asm
#	maps/RuinsOfAlphResearchCenter.asm
#	maps/VermilionPort.asm
#	maps/VictoryRoad.asm
2018-02-25 20:39:54 -05:00
yenatch
f44f306cfd
Merge pull request #477 from mid-kid/master
Medium-sized cleanups
2018-02-25 20:12:59 -05:00
Rangi
10173f2a62 Default macro parameters use recursion; avoids repeating internal structure 2018-02-25 20:12:58 -05:00