fb2ac9e210
Remaining map labels: UnknownText and MovementData
2018-03-01 17:33:43 -05:00
cad029f936
Label more map scripts
2018-03-01 13:18:51 -05:00
43b5f90457
Replace "Map<MapName>Signpost<#>Script" labels
2018-02-27 19:33:38 -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
f44f306cfd
Merge pull request #477 from mid-kid/master
...
Medium-sized cleanups
2018-02-25 20:12:59 -05:00
f964d04a87
* loadmenuheader -> loadmenu ( ead103d)
...
* objectface -> turnobject (c834bda
2018-02-25 20:05:37 -05:00
e8bc86d1fe
Pkmn -> Mon
...
Since we're aiming for consistency across the codebase, I believe it
includes a uniform way to refer to the creatures this game consists of
in the labels of the code.
The only exceptions to this rule are labels referring to things named
through the use of the <PK><MN> or <PKMN> characters, in which case PKMN
is used.
Most of this was already consistent enough™, I just picked the
convention with the most occurences and fixed the outliers.
2018-02-22 17:39:06 +01:00
c959f7a2ea
Labelling, once again.
2018-02-03 22:37:08 -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
c834bdadf2
spriteface → objectface, consistent with the other script commands
2018-02-02 21:50:43 -05:00
68d855c213
Script commands don't have underscores
2018-02-02 21:09:17 -05:00
48f4f2366e
Align map event coordinate columns
2018-02-01 22:22:07 -05:00
3088a77a21
warp_event x, y, map, warp_id
2018-02-01 21:54:00 -05:00
b2970e75f4
SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene pattern)
2018-02-01 15:06:06 -05:00
fcfe77bc3d
Meaningful scene constant names
...
(Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event)
2018-02-01 13:03:21 -05:00
a17623d96b
Add scene ID constants (TODO: meaningful names)
2018-01-31 23:16:51 -05:00
08891da822
const_def N
2018-01-31 11:38:45 -05:00
50a78c0876
Forgot the person→object rename
2018-01-31 11:08:47 -05:00
a2607623d3
Comment the person constants sections, like the others
2018-01-31 11:04:17 -05:00
65480605e9
Remove unreferenced map script heading labels
2018-01-30 14:15:47 -05:00
477adc72af
grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/g
2018-01-28 13:20:04 -05:00
d719d318e8
Remove Special_ prefix from special routines ( close #478 )
2018-01-24 11:17:05 -05:00
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
bf074f3598
map_header → map_def; map_header_2 → map_data
2018-01-16 23:25:00 -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
eb3102200f
More Battle Tower map script constants, fewer raw hex values
2018-01-14 19:26:55 -05:00
d83aefb30a
Use more constants in scripts
2018-01-12 02:27:42 -05:00
2f0973f3e0
Clean up some hex values in map scripts
2018-01-09 18:45:25 -05:00
b4a49351c1
Finish consistent Special function names
2018-01-02 17:47:58 +01:00
84e22eb578
Consistent (x, y) coordinate formatting in map scripts
2017-12-28 14:31:25 -05:00
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
e44640b008
Move more main.asm code into individual files
2017-12-15 21:22:26 -05:00
b4261d27d8
Use new palette constants
2017-12-10 20:50:08 -05:00
62f5913943
All map triggers use the `maptrigger` macro, not `dw`
...
.MapTriggers and .MapCallbacks lists are formatted consistently with .Warps, .XYTriggers, .Signposts, and .PersonEvents
2017-12-10 17:53:21 -05:00
09d9f2c1ef
Add MobileError-related labels
...
This function is called from a few different places in the mobile code,
including from one special that is only executed when the
BattleTowerRoomMenu special returns with a non-zero code.
Since that special causes a blue "error" screen to appear, that looks
the exact same as the one you'd get when trying to connect from the
mobile trade corner/battle colosseum in a Pokémon Center's top floor,
and this function contains a bunch of japanese strings in a jumptable, I
think it's reasonable to assume it should be called
"DisplayMobileError".
2017-11-26 11:35:13 +01:00
89d6a24644
Script_ChoseChallenge -> Script_ChooseChallenge
...
This script is called for the player to *choose* (or pick) the challenge
they want to undertake.
2017-11-26 11:29:38 +01:00
afc92eadc1
Label BattleTowerRoomMenu
...
All of the functions called by it are prefixed with BattleTowerRoomMenu,
but a bunch of them seem more generic than that, since they're part of
different mobile menus. Also called another menu jumptable
BattleTowerRoomMenu2 for the lack of a better name (only the Yes/No menu
functions are used in western crystal).
The names of the more generic functions should be fixed when we start
labelling other menus.
2017-11-25 17:03:20 +01:00
671341a0fb
Labelled some battle tower-related functions
...
The UbersCheck and LevelCheck are used only for the battle tower,
despite them living in the mobile files.
Also labelled some of the known BattleTowerActions.
2017-11-19 11:52:42 +01:00
d84ebd2124
pitchoffset macro to replace forceoctave
2016-07-29 10:40:54 -04:00
1fa6aecbfc
Unify directional movement macros
2016-05-14 13:46:14 -04:00
6be4cd4da9
Local labels starting with lowercase letters are no longer decorated with a trailing colon
2016-04-10 15:01:49 -04:00
93e12d2003
Split up banks 1-3 of main.asm
2016-03-27 12:47:28 -04:00
80aba7fc13
maptrigger macro
2016-01-05 08:46:37 -05:00
1df28a6beb
Merge branch 'master' of github.com:pret/pokecrystal into scriptmacrorenaming
2015-12-24 14:30:32 -05:00
a5a8364c35
opentext and breeding
2015-12-09 18:25:44 -05:00
5b7fc7b0fa
More battle tower shenanigans
2015-12-08 16:06:13 -05:00
0eb0c40ba7
buttonsound
2015-11-29 22:29:45 -05:00
0d944f5915
Person event constants for each map
2015-11-27 00:22:14 -05:00
c7985e1f3c
Battle Tower scripts and text labels
2015-11-26 21:05:32 -05:00
01792e00d2
Rename several script commands
2015-11-25 10:16:29 -05:00
Rangi