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
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
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
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
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
ead103d2c6
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440 )
2018-01-23 16:08:43 -05:00
05382d3e3c
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 12:25:55 -05:00
b199f6cfbf
Use hSerialConnectionStatus constants elsewhere
2018-01-19 19:31:45 -05:00
0c6338836d
Resolve #471 (although link code still needs more cleanup, like its WRAM labels)
2018-01-19 14:49:43 -05:00
8048082114
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 14:39:28 -05:00
dfcca93b45
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460 )
...
# Conflicts:
# engine/battle/core.asm
# engine/save.asm
2018-01-14 23:00:22 -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
8e1e583640
Close #470 (JOHTO_POKEMON)
2018-01-14 20:58:49 -05:00
c8575823a0
Battle data goes in data/battle/
...
TreeMons, like fish groups, have constants
2018-01-10 17:30:27 -05:00
2c789b64b1
Predef_FlagAction -> Predef_SmallFarFlagAction
2018-01-07 11:53:20 +01:00
e9e8bf6eb1
Predef_Flag -> Predef_FlagAction
2018-01-05 11:05:01 +01:00
10bd011d06
More relevant data file locations
2018-01-03 02:23:54 -05:00
51106cccd0
Scrub WRAM addresses from comments & use WRAM1_Begin where appropriate.
2018-01-03 00:19:54 -05:00
aa9a0a900d
No more mobile EQUS ret (replace with Stubbed_ + ret)
2018-01-02 20:00:14 +01:00
d7970f749a
Consistent predef function names
2018-01-02 18:49:25 +01:00
f1ea15bbfe
Consolidate Special function names
2018-01-02 17:13:57 +01:00
6f0b81504d
More unreferenced labels cleanup
2018-01-02 16:04:21 +01:00
7a24703398
Clean up Predef function names
2018-01-02 15:05:14 +01:00
38b84c5b11
Remove unused label (last few commits resolve #434 )
2017-12-26 13:00:23 -05:00
e34e68095d
Resolve #428 : Use HIGH(X) and LOW(X) instead of X / $100 and X % $100 or X >> 8 and X & $ff
2017-12-25 14:23:16 -05:00
b805d343f3
Merge branch 'master' of https://github.com/pret/pokecrystal
2017-12-24 17:30:29 -05:00
c66d195089
callba/callab → farcall/callfar
2017-12-24 12:47:30 -05:00
cbec3771e2
Misc fixes for the usage of constants
...
Several improvements that will make it easier to edit some data
structures for everyone.
2017-12-24 14:42:13 +01:00
e44640b008
Move more main.asm code into individual files
2017-12-15 21:22:26 -05:00
2cf5cc1dc7
Move more unknown graphics into real subfolders
2017-12-15 17:50:45 -05:00
94722aa8f0
Move predef/ files into engine/
...
Get rid of single-file engine/ subdirectories
Move tilesets/ palettes unrelated to individual tilesets into data/palettes/ (more from engine/colors.asm can be moved here too)
2017-12-15 12:31:18 -05:00
213dcc70d7
More consistent data tables
2017-12-11 22:59:30 -05:00
2d644f5077
Name some gfx/unknown/ files
2017-12-11 18:04:23 -05:00
4afc2f01ef
Add member constants for the base data struct, same as most other structs
2017-12-11 17:35:35 -05:00
5be98bae3c
Move more data tables into data/ files.
2017-12-11 15:20:32 -05:00
cd2a748128
More WRAM cleanup
2017-12-09 22:00:36 -05:00
512863989f
Document constants with comments, actual names, and more thorough usage
2017-12-09 02:15:46 -05:00
f0209d6ed6
Labels for Trainer Rankings stat tracking functions
2017-01-16 21:11:34 +00:00
4e2487c056
hLCDCPointer and InitList
2016-06-13 22:53:33 -04:00
d7a01e92e9
Remaining layout constants
2016-06-06 18:23:00 -04:00
87b733994b
SPRITE_ANIM_FRAME_IDX constants
2016-05-15 22:00:17 -04:00
6a3b3e3773
Save functions; feeble attempt at serial and link functions
2016-05-11 21:19:52 -04:00
ae36ef2c7f
Labeled every function in ROM0 that's referenced in the source
2016-05-10 12:31:49 -04:00
e95d42e0af
All functions in main.asm have non-generic names
2016-05-08 14:11:24 -04:00
8c26547645
Mobile and more battle anims
2016-05-05 15:07:37 -04:00
3713b71d9e
More splitting of main.asm; remove unneeded rept 2
2016-05-04 11:46:23 -04:00
bf73772a56
Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style
2016-04-10 14:42:14 -04:00
8bf255b9f8
Prepare to merge
2016-01-18 00:39:01 -05:00
Rangi