yenatch
f44f306cfd
Merge pull request #477 from mid-kid/master
...
Medium-sized cleanups
2018-02-25 20:12:59 -05:00
mid-kid
3d34f5a5a3
Label wPokemonWithdrawDepositParameter of RemoveMonFromPartyOrBox
...
It takes a clearly different parameter, completely unrelated and
different in function to PC_DEPOSIT and PC_WITHDRAW.
2018-02-22 21:36:14 +01:00
mid-kid
a22343d32c
Fix TRUE/FALSE constants for CalcMonStats
2018-02-22 18:12:43 +01: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
612fd7cb96
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# maps/KrissHouse2F.asm
2018-02-15 21:21:58 -05:00
luckytyphlosion
8b007e8d51
Fix more w-izing edge cases.
2018-02-04 22:45:04 -05:00
Rangi
d6b00d0cc1
Sync code with wiki
2018-02-04 13:16:40 -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
e32e5212af
use "x + -1" not "x +- 1"
...
(TODO: use "x - 1" once rgbds allows it)
2018-02-02 22:55:38 -05:00
luckytyphlosion
0b45e2e846
Fix wVirtualOAM labels, part 2.
2018-01-30 14:52:46 -05:00
Rangi
95fd05744d
Remove "UnusedSpecial_" prefixes too
2018-01-24 11:20:41 -05:00
Rangi
d719d318e8
Remove Special_ prefix from special routines ( close #478 )
2018-01-24 11:17:05 -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
c5cc23a35f
wGameTimerPause bit flag constants
2018-01-23 12:40:29 -05:00
Rangi
a73c532738
tile+color macros in gfx.asm
2018-01-22 19:40:17 -05:00
Rangi
363d8b9242
KrissHouse → PlayersHouse
2018-01-22 19:10:09 -05:00
Rangi
3a7f518de4
wStatusFlags/2 bit constants
2018-01-22 15:40:43 -05:00
Rangi
4d8528f903
More engine flag constants
2018-01-22 14:34:55 -05:00
Rangi
7cef012335
wUnlockedUnowns engine flag constants
...
Use local labels for "End"ings
2018-01-22 13:00:35 -05:00
Remy Oukaour
5ddea59ec5
wGBCOnlyDecompressBuffer
2018-01-21 20:10:38 -05:00
Remy Oukaour
05382d3e3c
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 12:25:55 -05:00
