c9cb67141b
Make reviewed fixes; standardize on " + "
2018-07-29 01:40:23 -04:00
8aa08addba
wLuckyNumberDigitsBuffer
2018-07-29 01:13:25 -04:00
9dec80b07e
Add meaningful aliases for wd265
...
Introduce MONICON_* constants
Introduce BATTLEPLAYERACTION_* constants
2018-07-29 00:25:52 -04:00
a1806d6e81
Consistent routine naming convention: 'Foo' wraps '_Foo'
2018-07-23 00:13:43 -04:00
db8830ba53
Label more mobile WRAM
...
Memes and a pipedream of a fully-documented wram.
2018-07-18 10:56:26 +02:00
1fc7430a2b
Fix misnamed character codes
...
Some character codes were erroneously named after their text command
counterparts. This has caused a lot of confusion with naming their
functions and with other things.
I've also removed the `dict2` macro and expanded the `dict` macro. This
really isn't something we should be doing for macros but I can't deny it
looks a lot neater than repeated code.
2018-07-18 10:55:30 +02:00
dba7f59d83
More OAM coordinate consistency
2018-07-15 11:58:01 -04:00
5693cc49cf
Single newline at the end of files
2018-06-25 12:07:35 -04:00
9f3e9145f9
Remove more triple newlines
2018-06-25 12:01:02 -04:00
67d1364c7a
Fix triple newlines left over from removing address comments
2018-06-24 23:22:50 -04:00
9afaed9b8f
Remove more address comments
2018-06-24 21:39:23 -04:00
5efce10789
Remove even more address comments
...
That should be all of them this time
2018-06-25 02:10:37 +02:00
1d9a68dbdd
Remove all address comments
2018-06-24 16:13:22 +02:00
32b92ca51c
Start improving sprite movement engine (to do: identify bit flags)
...
Introduce maskbits N[, S]: optionally shift the bitmask
2018-05-23 12:48:14 -04:00
8acc8d6e30
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-05-06 22:45:07 -04:00
1c92cb8b48
'rept' is not indented
2018-05-06 12:16:57 -04:00
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
7307fc8dce
Use constants for bit/set/res more
2018-04-05 11:44:02 -04:00
81306889e3
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-04-04 23:56:40 -04:00
81fff9bb80
Fix file permissions
...
I have no idea why this was a thing (do people store this repo on FAT32
flash drives or something?), but quite a bit of files had a permission
of 755. This isn't really a problem, but it's inconsistent and weird.
2018-04-01 17:05:10 +02:00
0447ee0cf9
Relabel some map-related WRAM
...
wMisc -> {wSurroundingTiles, wBoxPartialData, wLink_c608}
wOverworldMap -> {wOverworldMapBlocks, wHallOfFamePokemonList}
2018-03-19 11:36:14 -04: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
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
a22343d32c
Fix TRUE/FALSE constants for CalcMonStats
2018-02-22 18:12:43 +01: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
612fd7cb96
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# maps/KrissHouse2F.asm
2018-02-15 21:21:58 -05:00
8b007e8d51
Fix more w-izing edge cases.
2018-02-04 22:45:04 -05:00
d6b00d0cc1
Sync code with wiki
2018-02-04 13:16:40 -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
6ff2cb20e6
map → map_id; map_def → map; map_data → map_attributes
2018-02-03 17:11:55 -05:00
e32e5212af
use "x + -1" not "x +- 1"
...
(TODO: use "x - 1" once rgbds allows it)
2018-02-02 22:55:38 -05:00
0b45e2e846
Fix wVirtualOAM labels, part 2.
2018-01-30 14:52:46 -05:00
95fd05744d
Remove "UnusedSpecial_" prefixes too
2018-01-24 11:20:41 -05:00
d719d318e8
Remove Special_ prefix from special routines ( close #478 )
2018-01-24 11:17:05 -05:00
132fe46925
Rename some routines to avoid conflicts when removing "Special_" prefixes
2018-01-24 11:12:02 -05:00
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
f2ae74079f
Prefix wram labels with w, part 1.
...
Handle edge cases first.
2018-01-23 16:45:34 -05:00
ead103d2c6
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440 )
2018-01-23 16:08:43 -05:00
c5cc23a35f
wGameTimerPause bit flag constants
2018-01-23 12:40:29 -05:00
a73c532738
tile+color macros in gfx.asm
2018-01-22 19:40:17 -05:00
363d8b9242
KrissHouse → PlayersHouse
2018-01-22 19:10:09 -05:00
3a7f518de4
wStatusFlags/2 bit constants
2018-01-22 15:40:43 -05:00
4d8528f903
More engine flag constants
2018-01-22 14:34:55 -05:00
7cef012335
wUnlockedUnowns engine flag constants
...
Use local labels for "End"ings
2018-01-22 13:00:35 -05:00
5ddea59ec5
wGBCOnlyDecompressBuffer
2018-01-21 20:10:38 -05:00
05382d3e3c
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 12:25:55 -05:00
8127d1fbcf
Rename BATTLETOWER_NROF constants
2018-01-20 12:05:16 -05:00
b071dd364f
Japanese characters in Japanese text (e.g. "ォ" not "," for $f4)
2018-01-19 21:49:16 -05:00
ddec0ee305
More Japanese characters
2018-01-19 20:48:33 -05:00
Rangi