Commit Graph

41 Commits

Author SHA1 Message Date
Rangi 0447ee0cf9 Relabel some map-related WRAM
wMisc -> {wSurroundingTiles, wBoxPartialData, wLink_c608}
wOverworldMap -> {wOverworldMapBlocks, wHallOfFamePokemonList}
2018-03-19 11:36:14 -04:00
Rangi f0b01a4eea Document more quirks and bugs 2018-02-26 13:41:48 -05:00
Rangi 9a7da21006 Mention "HAUNTED HOUSE" (resolves #492) 2018-02-25 22:25:32 -05:00
Rangi 2f9a0d7d9f Pokecom Center Admin Room -> Office 2018-02-25 22:19:17 -05:00
Rangi f8f3294130 Add ROOF_ constants 2018-02-04 21:39:46 -05:00
Rangi 32ed487a47 Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
#	audio/engine.asm
#	constants/gfx_constants.asm
#	constants/map_data_constants.asm
#	constants/pokemon_data_constants.asm
#	constants/sprite_constants.asm
#	constants/wram_constants.asm
#	data/maps/data.asm
#	engine/battle/ai/scoring.asm
#	engine/battle/core.asm
#	engine/battle/effect_commands.asm
#	engine/battle/misc.asm
#	engine/battle_anims/getpokeballwobble.asm
#	engine/breeding.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/events/battle_tower/battle_tower.asm
#	engine/events/battle_tower/rules.asm
#	engine/events/buena.asm
#	engine/events/bug_contest/contest_2.asm
#	engine/events/daycare.asm
#	engine/events/dratini.asm
#	engine/events/halloffame.asm
#	engine/events/happiness_egg.asm
#	engine/events/kurt.asm
#	engine/events/lucky_number.asm
#	engine/events/magnet_train.asm
#	engine/events/overworld.asm
#	engine/events/pokerus/pokerus.asm
#	engine/events/print_unown.asm
#	engine/events/print_unown_2.asm
#	engine/events/unown_walls.asm
#	engine/item_effects.asm
#	engine/link.asm
#	engine/mon_menu.asm
#	engine/player_object.asm
#	engine/routines/playslowcry.asm
#	engine/scripting.asm
#	engine/search.asm
#	engine/search2.asm
#	engine/specials.asm
#	engine/start_menu.asm
#	engine/timeset.asm
#	home/battle_vars.asm
#	home/map.asm
#	maps/GoldenrodUndergroundSwitchRoomEntrances.asm
#	maps/IlexForest.asm
#	maps/KrissHouse2F.asm
#	maps/Route39Barn.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_5f.asm
#	wram.asm
2018-02-03 19:42:56 -05:00
Rangi 6ff2cb20e6 map → map_id; map_def → map; map_data → map_attributes 2018-02-03 17:11:55 -05:00
Rangi bf138d94d4 scene_def → scene_var (for "variable", like loadvar, copybytetovar, etc) 2018-02-03 16:20:19 -05:00
Rangi 936a170e0d MobileTradeRoom matches MobileBattleRoom 2018-01-31 23:21:15 -05:00
Rangi a17623d96b Add scene ID constants (TODO: meaningful names) 2018-01-31 23:16:51 -05:00
Rangi 5b678b336c Simpler map connection macro 2018-01-30 14:32:57 -05:00
luckytyphlosion a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
Rangi 517eab6526 "Speech" houses just have dialog NPCs 2018-01-23 12:54:17 -05:00
Rangi fdda670f40 Cry headers and map headers were eliminated 2018-01-23 11:17:21 -05:00
Rangi fc61d58dc4 Rename some more maps
The Pokécom Center's .blk contains 1F and the Administration room, but the .asm script is just for the Admin room; 1F-related text and scripts are in GoldenrodPokecenter1F.asm. Presumably both map scripts shared the same .blk.
2018-01-23 01:03:47 -05:00
Rangi 14cb5a3cb0 EcruteakHouse → EcruteakTinTowerEntrance 2018-01-23 00:30:07 -05:00
Rangi 363d8b9242 KrissHouse → PlayersHouse 2018-01-22 19:10:09 -05:00
Rangi 7f187be36c Don't say "House" twice 2018-01-22 18:29:21 -05:00
Rangi 7cef012335 wUnlockedUnowns engine flag constants
Use local labels for "End"ings
2018-01-22 13:00:35 -05:00
Remy Oukaour 226d1812b3 Only graphics data goes in gfx/
Introduce PALRGB_WHITE constant for $7fff
2018-01-18 11:16:24 -05:00
Remy Oukaour b1c808f9f8 Rename some tilesets (close #467) 2018-01-17 14:50:34 -05:00
Remy Oukaour e2ac753da1 No redundant filename prefixes 2018-01-17 00:00:43 -05:00
Remy Oukaour 3dcc0066a5 Comments help find map_data.asm 2018-01-16 23:55:33 -05:00
Remy Oukaour bf074f3598 map_header → map_def; map_header_2 → map_data 2018-01-16 23:25:00 -05:00
Remy Oukaour 3d0e1819e9 0/1 → FALSE/TRUE, with correct comment 2018-01-16 20:56:08 -05:00
Remy Oukaour 94bbfe2f0c Move map-related "metadata" files into data/maps/ 2018-01-16 19:56:21 -05:00
Remy Oukaour bdc95598d7 Easier to find palette data 2018-01-12 03:07:48 -05:00
Remy Oukaour 2b4a4ccaab SaffronMagnetTrainStation 2018-01-12 02:33:06 -05:00
Remy Oukaour b45f89f80c More constants and data tables 2018-01-11 01:45:27 -05:00
Remy Oukaour 9af6d8d0f1 Split tilesets/ into gfx/tilesets and data/tilesets/ 2018-01-09 23:53:58 -05:00
Remy Oukaour eb8e55a01a Route 17-18 Gate and Route 29-46 Gate 2018-01-01 18:19:32 -05:00
Remy Oukaour 84e22eb578 Consistent (x, y) coordinate formatting in map scripts 2017-12-28 14:31:25 -05:00
Remy Oukaour 7a4d641251 Remove redundant data/ filename prefixes 2017-12-27 01:29:15 -05:00
Remy Oukaour b5417fafec Split battle/ into data/ and engine/ components 2017-12-26 17:47:05 -05:00
Remy Oukaour b5a8e3b3b3 Follow the X_constants/X_data_constants convention 2017-12-25 23:45:54 -05:00
Remy Oukaour e34e68095d Resolve #428: Use `HIGH(X)` and `LOW(X)` instead of `X / $100` and `X % $100` or `X >> 8` and `X & $ff` 2017-12-25 14:23:16 -05:00
Remy Oukaour da2b01a36c Clean up color/palette code 2017-12-25 12:41:31 -05:00
Remy Oukaour 0a1fef45fd Rename maps:
- Underground -> UndergroundPath
- Route5UndergroundEntrance -> Route5UndergroundPathEntrance
- Route6UndergroundEntrance -> Route6UndergroundPathEntrance

- WarehouseEntrance -> GoldenrodUnderground
- UndergroundWarehouse -> GoldenrodUndergroundWarehouse
- UndergroundPathSwitchRoomEntrances -> GoldenrodUndergroundSwitchRoomEntrances
2017-12-24 18:06:12 -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
Remy Oukaour 20d6c1d876 Rename "map permissions" to "map environment" (fix #396) 2017-12-24 13:08:38 -05:00
Remy Oukaour 6ab1d028bb Split items/ and trainers/ into their data/ and engine/ components
Move some data into a pokemon/ subdirectory
2017-12-14 23:00:54 -05:00