Rangi
711e2d6143
Mention unused Battle Tower-related text ( resolves #491 )
2018-02-25 22:33:07 -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
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
yenatch
f404af8a43
Merge pull request #486 from surskitty/master
...
Another batch of label names
2018-02-25 20:12:31 -05:00
Rangi
f964d04a87
* loadmenuheader -> loadmenu (ead103d)
...
* objectface -> turnobject (c834bda)
2018-02-25 20:05:37 -05:00
mid-kid
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
luckytyphlosion
8b007e8d51
Fix more w-izing edge cases.
2018-02-04 22:45:04 -05:00
surskitty
c959f7a2ea
Labelling, once again.
2018-02-03 22:37:08 -05:00
surskitty
e668b6cf3a
Merge branch 'master' of github.com:pret/pokecrystal
2018-02-03 22:18:56 -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
yenatch
b35eb72290
Merge pull request #480 from luckytyphlosion/master
...
[Ready to merge] Prefix wram labels with w.
2018-02-03 17:15:20 -05:00
Rangi
c834bdadf2
spriteface → objectface, consistent with the other script commands
2018-02-02 21:50:43 -05:00
Rangi
aa8db1632c
Remove checkmorn/checkday/checknite macros
2018-02-02 21:20:13 -05:00
Rangi
68d855c213
Script commands don't have underscores
2018-02-02 21:09:17 -05:00
surskitty
2edf131b05
Route 30 Berry Speech House labels
2018-02-02 16:52:15 -05:00
surskitty
955e43c630
Labels, labels, labels
2018-02-02 12:08:43 -05:00
surskitty
1b3a269812
Local jumps, once again.
2018-02-02 11:57:24 -05:00
surskitty
507a8f3535
Ruins of Alph partial labels
2018-02-02 11:57:11 -05:00
surskitty
b37cc569be
Radio Card local jumps
2018-02-02 11:30:16 -05:00
surskitty
ddd0b6f958
Jasmine and Amphy labels
2018-02-02 11:13:28 -05:00
surskitty
f1e4951cf1
Sailor Huey labels
2018-02-02 11:02:31 -05:00
surskitty
b94c1f7084
Labelling the Victory Road rival script
2018-02-02 10:57:06 -05:00
