c82deab86f
fix-various-little-things
...
A compilation of suggestions from the discord that don't deserve
separate commits and are not questionable at all™.
2018-05-05 09:19:04 +02:00
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
e2c15b0b92
* BillPhoneGeneriText -> BillPhoneGenericText
...
* data/phone/text/trainers1.asm -> data/phone/text/trainers.asm
* ,ROM -> , ROM0
2018-02-26 22:29:09 -05:00
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
e668b6cf3a
Merge branch 'master' of github.com:pret/pokecrystal
2018-02-03 22:18:56 -05:00
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
aa8db1632c
Remove checkmorn/checkday/checknite macros
2018-02-02 21:20:13 -05:00
68d855c213
Script commands don't have underscores
2018-02-02 21:09:17 -05:00
8ea924ecd6
Converting what I can to locals.
2018-02-02 10:52:05 -05:00
6ebe45e41f
Move event data to data/events/
2018-01-25 22:19:24 -05:00
d719d318e8
Remove Special_ prefix from special routines ( close #478 )
2018-01-24 11:17:05 -05:00
505a6595bc
EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481 )
2018-01-24 10:46:49 -05:00
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
efe6981a0d
Add daily+weekly bit flags (close issue #429 )
2018-01-22 15:59:24 -05:00
125d51b3b2
More engine bit flag constants
2018-01-22 13:57:44 -05:00
e69544b61f
More Unicode
2018-01-19 02:30:19 -05:00
a3beba1e64
Use Japanese charmap definitions in strings
2018-01-18 20:49:17 -05:00
bf074f3598
map_header → map_def; map_header_2 → map_data
2018-01-16 23:25:00 -05:00
2b82338920
Phone data 0/7 are time masks
2018-01-15 22:00:56 -05:00
5c28d05bb4
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459 )
...
# Conflicts:
# data/items/descriptions.asm
# data/sprite_anims/framesets.asm
# engine/crystal_colors.asm
# engine/events/kurt.asm
# engine/events/special.asm
# engine/events/std_scripts.asm
# engine/events_3.asm
# engine/item_effects.asm
# engine/namingscreen.asm
# engine/scripting.asm
# engine/stats_screen.asm
# engine/trade_animation.asm
# home/audio.asm
# main.asm
# maps/BattleTower1F.asm
# maps/BattleTowerBattleRoom.asm
# maps/BurnedTowerB1F.asm
# maps/ElmsLab.asm
# maps/GoldenrodDeptStore5F.asm
# maps/GoldenrodUnderground.asm
# maps/HallOfFame.asm
# maps/MahoganyTown.asm
# maps/ManiasHouse.asm
# maps/MobileBattleRoom.asm
# maps/MobileTradeRoomMobile.asm
# maps/RadioTower2F.asm
# maps/Route35NationalParkGate.asm
# maps/Route36NationalParkGate.asm
# maps/Route39Farmhouse.asm
# tilesets/palette_maps.asm
2018-01-14 22:56:36 -05:00
d83aefb30a
Use more constants in scripts
2018-01-12 02:27:42 -05:00
b45f89f80c
More constants and data tables
2018-01-11 01:45:27 -05:00
feb34b49ba
data/phone_text → data/phone/text
2018-01-09 19:51:30 -05:00
31edd7f803
Move text/ into data/
2018-01-09 00:23:48 -05:00
aa9a0a900d
No more mobile EQUS ret (replace with Stubbed_ + ret)
2018-01-02 20:00:14 +01:00
f1ea15bbfe
Consolidate Special function names
2018-01-02 17:13:57 +01:00
040aa7cb17
LoadEDTile → CopyTilemapAtOnce ( fix #345 )
2017-12-24 18:11:17 -05:00
20d6c1d876
Rename "map permissions" to "map environment" ( fix #396 )
2017-12-24 13:08:38 -05:00
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
c883ab4d34
Reorganising phone stuff.
2017-12-15 23:06:53 -05:00
mid-kid