Commit Graph

3286 Commits

Author SHA1 Message Date
yenatch e400fe5142
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
2017-12-24 17:39:50 -05:00
Remy Oukaour 3e7f3bbeb6 s/number/scene/, and correct some documentation 2017-12-24 17:35:33 -05:00
Remy Oukaour b805d343f3 Merge branch 'master' of https://github.com/pret/pokecrystal 2017-12-24 17:30:29 -05:00
yenatch 70e6b5947b
Merge pull request #417 from mid-kid/master
mid-kid's patches
2017-12-24 16:57:20 -05:00
Remy Oukaour ef9090b9a0 Update documentation to match renaming 2017-12-24 15:09:28 -05:00
Remy Oukaour 9973e43d5a Fix issue #345:
- GetMonFrontpic → GetEnemyMonFrontpic
- GetMonBackpic → GetBattleMonBackpic
- FrontpicPredef → GetAnimatedFrontpicPredef
- GetFrontpic → GetMonFrontpic
- GetBackpic → GetMonBackpic
- CutAndPasteMap → PadMapForHDMATransfer
2017-12-24 15:03:20 -05:00
Remy Oukaour 4e5fd7a521 Merge branch 'master' of https://github.com/pret/pokecrystal 2017-12-24 14:33:37 -05:00
Remy Oukaour c05b7f41dd Renaming: (fix #412)
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 14:33:17 -05:00
yenatch 8a8b96138b remove redundant 2bpp/1bpp files 2017-12-24 13:58:17 -05:00
Remy Oukaour 20d6c1d876 Rename "map permissions" to "map environment" (fix #396) 2017-12-24 13:08:38 -05:00
Remy Oukaour 10a1e6c860 Support old one-argument sound_duty macro, similar to callab/callba legacy support 2017-12-24 12:52:05 -05:00
Remy Oukaour c66d195089 callba/callab → farcall/callfar 2017-12-24 12:47:30 -05:00
mid-kid cbec3771e2 Misc fixes for the usage of constants
Several improvements that will make it easier to edit some data
structures for everyone.
2017-12-24 14:42:13 +01:00
mid-kid 21607bdd1f HELD_TRADE_EVOLVE -> HELD_FLINCH
This item effect effectively causes the target to flinch (sometimes).
It's not exclusive to trade evolve items in later generations either.
2017-12-24 14:42:05 +01:00
yenatch d787c66374
Merge pull request #420 from surskitty/master
Partial Phone Script Labels
2017-12-23 17:20:21 -05:00
yenatch c51968f0de Merge remote-tracking branch 'origin/master' into master 2017-12-23 17:14:09 -05:00
yenatch 8780920049
Merge pull request #419 from roukaour/master
More reorganization and documentation
2017-12-23 13:17:46 -05:00
Remy Oukaour 3c37bfc6fa Correct address comment 2017-12-23 12:17:11 -05:00
Remy Oukaour 82a8228e67 Keep images within repo 2017-12-23 12:08:34 -05:00
Remy Oukaour 2309396c88 Don't keep commented-out SECTION headers 2017-12-23 11:47:28 -05:00
Remy Oukaour 1d2df3bba1 Some more WRAM cleanup 2017-12-23 11:34:55 -05:00
Remy Oukaour 2f9f2317a3 Document the meaning of hour and daytime values for person_events 2017-12-23 01:19:34 -05:00
Remy Oukaour aa97752efe Move NUM_BUENA_PRIZES to event/buena.asm (still hard-coded)
Buena_PrizeMenu has "rept NUM_BUENA_PRIZES", which needs NUM_BUENA_PRIZES to be already defined. BuenaPrizeItems and BuenaPrizeItemsEnd are needed to define NUM_BUENA_PRIZES; but BuenaPrizeItems is defined after Buena_PrizeMenu. I don't see a way to avoid hard-coding its value of 9.

Contrast that with the NUM_MOM_ITEMS constants, which are not used as "rept" arguments and so can be defined within their code file.
2017-12-23 00:31:04 -05:00
Remy Oukaour daa071451d More comments for constant<->table correspondences 2017-12-22 23:08:55 -05:00
Remy Oukaour 14a244ad3a IsHM is not used within home/names.asm; group it with the other HM routines+data 2017-12-22 22:56:21 -05:00
Remy Oukaour b423e3b90b Split more code from home.asm into home/ files 2017-12-22 22:50:28 -05:00
Remy Oukaour 1ecbfc49f4 Correct directions 2017-12-22 18:01:06 -05:00
Remy Oukaour ae3bef5596 Document one more graphical mistake 2017-12-22 17:59:50 -05:00
Remy Oukaour 763bd48141 Document a graphical error 2017-12-22 17:52:34 -05:00
Remy Oukaour ff4d25eee3 Include bugfix in comments 2017-12-21 12:11:35 -05:00
Remy Oukaour d6dccb7df5 Use NAME_LENGTH_JAPANESE more 2017-12-21 11:56:33 -05:00
Remy Oukaour 02609940db Document one more bug 2017-12-21 11:43:41 -05:00
Remy Oukaour 2fa1e97aeb Document two more bugs 2017-12-19 19:04:56 -05:00
Remy Oukaour 17058aaec2 Auto-label more map scripts 2017-12-17 20:56:35 -05:00
Remy Oukaour 3ed016f9e0 Auto-label more map scripts 2017-12-17 20:17:30 -05:00
Remy Oukaour 25a3960646 Move some more main.asm routines into individual files 2017-12-16 19:00:50 -05:00
Remy Oukaour 05d49f7d75 Move more code out of main.asm 2017-12-16 12:49:43 -05:00
Remy Oukaour aa44ecfc4f Consolidate duplicate graphics 2017-12-16 12:09:16 -05:00
Remy Oukaour bd6dc94da0 Move tileset-specific palette code into tilesets/ 2017-12-16 00:52:16 -05:00
Remy Oukaour fbf931f5d3 Ad some more constants for meaningful audio WRAM bits 2017-12-16 00:50:03 -05:00
Remy Oukaour cbde91d7ed Only engine/decorations.asm uses PadCoords_de 2017-12-15 23:59:24 -05:00
Remy Oukaour 5aac8afae7 PLAYER_SLIP → PLAYER_SKATE (probably used for the beta skateboard; DoPlayerMovement.BikeCheck returns true for it) 2017-12-15 23:29:42 -05:00
surskitty c883ab4d34 Reorganising phone stuff. 2017-12-15 23:06:53 -05:00
Remy Oukaour fa98c29fa4 Add more palettes to data/palettes/ 2017-12-15 22:36:33 -05:00
Remy Oukaour f96aab4014 Correct some documentation comments 2017-12-15 21:32:43 -05:00
Remy Oukaour e44640b008 Move more main.asm code into individual files 2017-12-15 21:22:26 -05:00
Remy Oukaour 01bd8ac94c Move old baserom.gbc 'compare' scripts to tools/ 2017-12-15 20:12:00 -05:00
Remy Oukaour 1038ebca5e Move more contiguous related code blocks from main.asm to engine/ and events/ 2017-12-15 20:10:54 -05:00
Remy Oukaour 606817f18b Add a map_connection_struct macro 2017-12-15 18:25:32 -05:00
surskitty cb5aa29228 Labelling the remaining stuff one sed at a time. 2017-12-15 18:16:27 -05:00