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
Rangi
be28a0ff4e
Meaningful $ff values
2018-02-25 19:50:48 -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
Rangi
ff3a43d4b0
Use maskbits NUM_TYPES
2018-02-20 10:54:48 -05:00
Rangi
bc3cc69749
Consistent "X percent [+/- Y]" order
2018-02-04 21:21:34 -05:00
Rangi
d6b00d0cc1
Sync code with wiki
2018-02-04 13:16:40 -05:00
Rangi
73ea7c6326
Macro factors out sine code, just like sine data, since it's used 5 times
2018-02-03 21:11:55 -05:00
Rangi
271aa20b73
Keep documentation in sync with new WRAM labels
2018-02-03 20:40:21 -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
45373ec601
sine_wave macro parameterizes table size, not frequency ("amplitude" was an incorrect comment)
2018-02-02 22:45:42 -05:00
luckytyphlosion
0b45e2e846
Fix wVirtualOAM labels, part 2.
2018-01-30 14:52:46 -05:00
luckytyphlosion
3203ad7d50
Fix comment/style issues caused from w-izing.
2018-01-30 14:05:25 -05:00
Rangi
e22670438e
Badge type boosts make sense in data/types/
2018-01-28 01:17:32 -05:00
Rangi
0cf4eb6895
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 11:36:00 -05:00
Rangi
a0cc4a3392
Move power data belongs in data/moves/
2018-01-26 11:01:15 -05:00
Rangi
87514598be
More battle data in data/battle/
2018-01-25 21:34:42 -05:00
Rangi
d504fb8852
Move AI data tables into data/battle/ai (mirroring engine/battle/ai) so they're more discoverable.
2018-01-25 20:34:33 -05:00
Rangi
132fe46925
Rename some routines to avoid conflicts when removing "Special_" prefixes
2018-01-24 11:12:02 -05:00
luckytyphlosion
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
luckytyphlosion
f2ae74079f
Prefix wram labels with w, part 1.
...
Handle edge cases first.
2018-01-23 16:45:34 -05:00
Rangi
ead103d2c6
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440 )
2018-01-23 16:08:43 -05:00
Rangi
cb5e3378de
Move type data to data/types/
2018-01-22 16:23:34 -05:00
Rangi
4d8528f903
More engine flag constants
2018-01-22 14:34:55 -05:00
Rangi
125d51b3b2
More engine bit flag constants
2018-01-22 13:57:44 -05:00
Rangi
7cef012335
wUnlockedUnowns engine flag constants
...
Use local labels for "End"ings
2018-01-22 13:00:35 -05:00
