Commit Graph

555 Commits

Author SHA1 Message Date
Rangi cdfdfed17b Crystal fixed TruncateHL_BC in single player 2018-07-27 21:32:14 -04:00
Rangi d5b98f5206 wPokeAnimStruct matches wPokeAnimStructEnd 2018-07-23 00:37:48 -04:00
mid-kid db8830ba53 Label more mobile WRAM
Memes and a pipedream of a fully-documented wram.
2018-07-18 10:56:26 +02:00
Rangi a70624adfb Correct wTradeFlags length 2018-07-13 17:18:19 -04:00
Rangi 67d1364c7a Fix triple newlines left over from removing address comments 2018-06-24 23:22:50 -04:00
Rangi ff4cfffe14 wMartItemBCDEnd is unused 2018-06-23 23:27:43 -04:00
Rangi fbe82a7fe0 Note which labels are only needed for locating banks (relevant to issue #485) 2018-06-12 23:29:15 -04:00
Rangi ad5337863d Use SPRITE_VARS 2018-05-23 00:05:07 -04:00
Rangi 7307fc8dce Use constants for bit/set/res more 2018-04-05 11:44:02 -04:00
Rangi 145efc1353 Use constants for screen size in metatiles 2018-04-04 16:14:48 -04:00
Rangi 0447ee0cf9 Relabel some map-related WRAM
wMisc -> {wSurroundingTiles, wBoxPartialData, wLink_c608}
wOverworldMap -> {wOverworldMapBlocks, wHallOfFamePokemonList}
2018-03-19 11:36:14 -04: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
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 79849a7e40 db/dw, and keep unused space away from labels 2018-02-03 21:22:06 -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 2a53d75807 Similar formatting for similar WRAM areas 2018-02-02 21:15:15 -05:00
Rangi 936a170e0d MobileTradeRoom matches MobileBattleRoom 2018-01-31 23:21:15 -05:00
luckytyphlosion 4a3384ab09 wSpritesEnd -> wVirtualOAMEnd. 2018-01-30 14:55:20 -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
luckytyphlosion a1951cefc0 Prefix wram labels with w, part 2. 2018-01-23 17:39:09 -05:00
luckytyphlosion 79bd48f85c Replace Stack with wStack. 2018-01-23 16:49:58 -05:00
luckytyphlosion f2ae74079f Prefix wram labels with w, part 1.
Handle edge cases first.
2018-01-23 16:45:34 -05:00
Rangi 09ff04dbfc wMenuData3 → w2DMenuData 2018-01-23 16:38:52 -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 682548493b Struct macros should have their main label outside the macro 2018-01-23 11:40:32 -05:00
Rangi 14cb5a3cb0 EcruteakHouse → EcruteakTinTowerEntrance 2018-01-23 00:30:07 -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 125d51b3b2 More engine bit flag constants 2018-01-22 13:57:44 -05:00
Rangi e135091f09 Day-Care bit flags 2018-01-22 13:18:23 -05:00
Remy Oukaour 5bd84e7b4d Comment on wGBCOnlyDecompressBuffer size 2018-01-21 21:51:52 -05:00
Remy Oukaour 5ddea59ec5 wGBCOnlyDecompressBuffer 2018-01-21 20:10:38 -05:00
Remy Oukaour f091bb8f03 6 → PARTY_LENGTH 2018-01-21 18:15:48 -05:00
Remy Oukaour 05382d3e3c PARTY_LENGTH; MON_NAME; sgb_border.bin 2018-01-20 12:25:55 -05:00
Remy Oukaour 99f26a6097 Compute wc7e8 size 2018-01-18 01:28:51 -05:00
Remy Oukaour 95c0c31c8f Eliminate wd000 2018-01-18 01:25:19 -05:00
Remy Oukaour bf074f3598 map_header → map_def; map_header_2 → map_data 2018-01-16 23:25:00 -05:00
Remy Oukaour 14c8cf5b48 Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR #452)
# Conflicts:
#	data/player_names.asm
#	engine/battle/menu.asm
#	engine/billspc.asm
#	engine/billspctop.asm
#	engine/buy_sell_toss.asm
#	engine/decorations.asm
#	engine/delete_save_change_clock.asm
#	engine/events/buena.asm
#	engine/events/elevator.asm
#	engine/events/kurt.asm
#	engine/events/mom.asm
#	engine/events/move_tutor.asm
#	engine/events/pokecenter_pc.asm
#	engine/events/pokepic.asm
#	engine/events/std_scripts.asm
#	engine/events/unown_walls.asm
#	engine/init_gender.asm
#	engine/intro_menu.asm
#	engine/mail.asm
#	engine/main_menu.asm
#	engine/mart.asm
#	engine/menu_2.asm
#	engine/mon_menu.asm
#	engine/pack.asm
#	engine/slot_machine.asm
#	engine/start_menu.asm
#	home/menu.asm
#	maps/CeladonDeptStore6F.asm
#	maps/CeladonGameCornerPrizeRoom.asm
#	maps/DragonShrine.asm
#	maps/EarlsPokemonAcademy.asm
#	maps/GoldenrodCity.asm
#	maps/GoldenrodDeptStore6F.asm
#	maps/GoldenrodGameCorner.asm
#	maps/GoldenrodPokeComCenter2FMobile.asm
#	mobile/mobile_12.asm
#	mobile/mobile_12_2.asm
#	mobile/mobile_22.asm
#	mobile/mobile_22_2.asm
#	mobile/mobile_40.asm
#	mobile/mobile_45.asm
#	mobile/mobile_45_sprite_engine.asm
#	mobile/mobile_46.asm
#	mobile/mobile_5c.asm
#	mobile/mobile_5f.asm
#	mobile/mobile_menu.asm
2018-01-14 23:43:51 -05:00
Remy Oukaour 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
mid-kid 066cc91b13 Fix some MenuData2 labels
Gave them better names, moved the flags out of the union, and documented
the w2DMenuFlags1.
2018-01-14 11:59:27 +01:00
Remy Oukaour 2b4a4ccaab SaffronMagnetTrainStation 2018-01-12 02:33:06 -05:00
Remy Oukaour 17f34cb29c Disambiguate some uses of wcf64/5/6 2018-01-11 15:36:11 -05:00
Remy Oukaour fd0a78d708 Trainer card has state constants and WRAM labels 2018-01-11 14:43:18 -05:00
Remy Oukaour 417937cffc Resolve #461 2018-01-10 13:47:57 -05:00
Remy Oukaour cc0fd6e12c CRYSTAL11 → _CRYSTAL11 2018-01-09 17:26:40 -05:00
Remy Oukaour d0a8e8e744 includes.asm → constants.asm 2018-01-09 00:36:15 -05:00
Adelaide Walter 9d0ba6bfd3 Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary). 2018-01-03 19:12:45 -05:00
Adelaide Walter fb825a800e Label MobileCrashCheckPointer and consolidate relevant functions. 2018-01-02 23:16:56 -05:00
Remy Oukaour eb8e55a01a Route 17-18 Gate and Route 29-46 Gate 2018-01-01 18:19:32 -05:00
xCrystal 37369d1ae0 Rename Pals labels in WRAM bank 5 2018-01-01 20:09:53 +01:00
Remy Oukaour e1a672e427 Constants for TextBoxFlags 2017-12-29 13:18:17 -05:00
Remy Oukaour b9a68fec25 Consistent if/else/endc (matches rept/endr) and DEF (matches BANK/HIGH/LOW) 2017-12-28 22:13:39 -05:00
Remy Oukaour 4c35f3ac85 Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
#	macros/scripts/maps.asm
2017-12-28 20:56:21 -05:00
xCrystal a45c6a558b Better placement for wram address 2017-12-28 19:42:16 +01:00
xCrystal d6507e3882 More constants and documentation in slot machines 2017-12-28 19:38:15 +01:00
Remy Oukaour b373984ab9 Rename pokemon animation files (fix #439) 2017-12-28 11:05:42 -05:00
xCrystal 333524f0be Lowercase v for VRAM addresses 2017-12-28 13:32:33 +01:00
xCrystal 9457679af8 Prefix engine_flags wram addresses with w 2017-12-28 13:15:46 +01:00
Remy Oukaour 2c4777f336 05:OBPals+6*8 == 01:wCurMessageScrollPosition (new) 2017-12-28 00:56:45 -05:00
Remy Oukaour 47e4f21e62 Keep memory map values in hardware_constants.asm 2017-12-26 23:18:05 -05:00
Remy Oukaour 5d229dcef2 Copy sram.asm's global start/end constants for wram.asm and vram.asm 2017-12-26 23:07:46 -05:00
Remy Oukaour 172dba3c0b Rename some sections
engine/battle_tower.asm fits better in events/
2017-12-26 22:57:19 -05:00
Remy Oukaour 9bc680bd6d Battle animation data is like sprite animation data 2017-12-26 19:27:56 -05:00
Remy Oukaour 38b84c5b11 Remove unused label (last few commits resolve #434) 2017-12-26 13:00:23 -05:00
Remy Oukaour 24f0e7d045 Rename: emote_headers, sprite_headers, cry_headers, gfx_headers, tileset_headers 2017-12-26 12:50:32 -05:00
Remy Oukaour 0a1fef45fd Rename maps:
- Underground -> UndergroundPath
- Route5UndergroundEntrance -> Route5UndergroundPathEntrance
- Route6UndergroundEntrance -> Route6UndergroundPathEntrance

- WarehouseEntrance -> GoldenrodUnderground
- UndergroundWarehouse -> GoldenrodUndergroundWarehouse
- UndergroundPathSwitchRoomEntrances -> GoldenrodUndergroundSwitchRoomEntrances
2017-12-24 18:06:12 -05:00
Remy Oukaour c05b7f41dd Renaming: (fix #412)
- MapTriggers / maptrigger → SceneScripts / scene_script
- XYTriggers / xy_trigger → CoordEvents / coord_event
- Signposts / signpost → BGEvents / bg_event
- PersonEvents / person_event → ObjectEvents / object_event
2017-12-24 14:33:17 -05:00
Remy Oukaour 20d6c1d876 Rename "map permissions" to "map environment" (fix #396) 2017-12-24 13:08:38 -05:00
Remy Oukaour 3c37bfc6fa Correct address comment 2017-12-23 12:17:11 -05:00
Remy Oukaour 2309396c88 Don't keep commented-out SECTION headers 2017-12-23 11:47:28 -05:00
Remy Oukaour 1d2df3bba1 Some more WRAM cleanup 2017-12-23 11:34:55 -05:00
Remy Oukaour e44640b008 Move more main.asm code into individual files 2017-12-15 21:22:26 -05:00
Remy Oukaour 606817f18b Add a map_connection_struct macro 2017-12-15 18:25:32 -05:00
Remy Oukaour 6ab1d028bb Split items/ and trainers/ into their data/ and engine/ components
Move some data into a pokemon/ subdirectory
2017-12-14 23:00:54 -05:00
Remy Oukaour 79873a1bfc Move pic animation documentation to docs/
Move growth rates to a data/ table
Name more SECTIONs
2017-12-11 23:44:29 -05:00
Remy Oukaour 4afc2f01ef Add member constants for the base data struct, same as most other structs 2017-12-11 17:35:35 -05:00
Remy Oukaour 31cce83e9b Move lots of data tables into individual data/ files
(This is not expected to be their final location, but it makes them easier to relocate when necessary, and easier for users to edit until the whole project's file structure is finalized.)
2017-12-11 14:23:18 -05:00
Remy Oukaour c2ad79c4f2 Add constants for time-of-day boundaries
Split off more misc constants into proper files
2017-12-11 12:20:01 -05:00
Remy Oukaour 699495bfcb Consistent capitalization for map names, matching their constants 2017-12-10 13:37:15 -05:00
Remy Oukaour 59ee673775 Consistent pointer labels in WRAM 2017-12-09 22:24:43 -05:00
Remy Oukaour cd2a748128 More WRAM cleanup 2017-12-09 22:00:36 -05:00
Remy Oukaour 880fb511e1 More WRAM organization 2017-12-09 15:28:03 -05:00
Remy Oukaour e3c686f6df Further WRAM organization 2017-12-09 15:14:51 -05:00
Remy Oukaour 5a5df2ab87 More WRAM organization 2017-12-09 14:47:32 -05:00
Remy Oukaour 16c6696dd5 Start organizing WRAM
- Use db and dw when they're more meaningful than ds 1/2
- Use unions to group related labels
2017-12-09 13:58:49 -05:00
Remy Oukaour 0b7d8d44ad More constants 2017-12-09 13:28:23 -05:00
Remy Oukaour 512863989f Document constants with comments, actual names, and more thorough usage 2017-12-09 02:15:46 -05:00
yenatch a950b020cd Align "Sprites" section to $100 bytes.
The code expects this section to be aligned.
2017-09-24 03:27:47 -04:00
yenatch 17448c51a5 Merge pull request #389 from yenatch/rgbds-3
rgbds 0.3.3
2017-09-24 01:23:34 -04:00
PikalaxALT 63bc19e33d Make repository compatible with RGBDS 0.3.3 (breaks support for earlier versions of RGBDS) 2017-09-24 01:15:05 -04:00
PikalaxALT 0e470bc785 Fix section linking
Create linker script and float all sections
2017-09-23 23:04:10 -04:00
i0brendan0 7b67e7296a Remove possibility of garbage characters
If the ds 2 that is behind OTClassName is deleted or decreased, the game will continue to display characters for trainer classes that are 12 or 13 characters long, including the @ terminator. The correct constant has been put in place and the ds 2 removed, but no one would have known it was wrong if they hadn't have removed the ds 2.
2017-08-30 20:56:11 -05:00
Ben10do 288902139f Revert "Fix floating sections"
This reverts commit e28b88f56d.
2017-03-24 11:51:03 +00:00
AntonioND e28b88f56d Fix floating sections
This is needed so that rgblink doesn't move them around after modifying
it's placement algorithm.

Signed-off-by: AntonioND <antonio_nd@outlook.com>
2017-03-15 00:52:26 +00:00
Fredrik Ljungdahl f8455e9b4f Reverse the LastEnemyCounterMove and LastPlayerCounterMove labels
They were swapped
2017-01-08 01:26:48 +01:00
Fredrik Ljungdahl f6cfccd1ff Fix some wrong comments regarding battle substatuses 2016-10-29 01:57:58 +02:00
PikalaxALT 050a0162b8 Rename the variable at D264 2016-08-07 18:14:20 -04:00
pikalaxalt 4e2487c056 hLCDCPointer and InitList 2016-06-13 22:53:33 -04:00
pikalaxalt d7a01e92e9 Remaining layout constants 2016-06-06 18:23:00 -04:00
pikalaxalt 98f443f70c engine/events.asm labels finished
fixed palred/green/blue macros
2016-05-17 08:40:56 -04:00
pikalaxalt 2eeb78d1bc Evolution addresses 2016-05-16 15:46:13 -04:00
pikalaxalt 12396874cf HP bar animation addresses and AI switch 2016-05-16 09:36:24 -04:00
pikalaxalt e515543500 Name all functions in gfx/pics/animation.asm 2016-05-15 23:56:09 -04:00
pikalaxalt 87b733994b SPRITE_ANIM_FRAME_IDX constants 2016-05-15 22:00:17 -04:00
pikalaxalt a5f5418fae Rename FixedWords to EZChat 2016-05-14 16:37:12 -04:00
pikalaxalt 1fa6aecbfc Unify directional movement macros 2016-05-14 13:46:14 -04:00
pikalaxalt 1a84ca4e55 EZChat cursor object 2016-05-14 01:11:01 -04:00
pikalaxalt 6a3b3e3773 Save functions; feeble attempt at serial and link functions 2016-05-11 21:19:52 -04:00
pikalaxalt af0119ca7e Name all printer functions 2016-05-11 17:16:03 -04:00
pikalaxalt f8c14d97e5 Pitch wheel 2016-05-10 14:33:24 -04:00
pikalaxalt e95d42e0af All functions in main.asm have non-generic names 2016-05-08 14:11:24 -04:00
pikalaxalt 8c26547645 Mobile and more battle anims 2016-05-05 15:07:37 -04:00
pikalaxalt a613ed915c HDMA transfer functions 2016-05-04 22:34:09 -04:00
pikalaxalt 3713b71d9e More splitting of main.asm; remove unneeded rept 2 2016-05-04 11:46:23 -04:00
pikalaxalt 82f1534925 Copycat labels; macro for the Crystal-only Unown chamber unlock words 2016-04-30 21:20:12 -04:00
pikalaxalt 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
pikalaxalt f2fa5349d5 More annotations of HP bar animations, including an oversight by GameFreak resulting in super-slow HP bars for Pokemon with over 48 HP 2016-03-08 19:54:06 -05:00
PikalaxALT 599e6e8d16 Battle animation annotations 2016-03-01 22:31:21 -05:00
PikalaxALT b272c0c375 Fix marts using hard-coded bank number 2016-01-27 12:25:12 -05:00
PikalaxALT 8a45169a9d Merge branch 'master' of https://github.com/pret/pokecrystal 2016-01-18 00:56:33 -05:00
PikalaxALT 8bf255b9f8 Prepare to merge 2016-01-18 00:39:01 -05:00
PikalaxALT 7cc2571529 Finish function labels in battle core 2016-01-13 00:39:41 -05:00
PikalaxALT 2ed6c357af More WRAM tidying 2016-01-12 12:46:18 -05:00
PikalaxALT 1637d915d4 Restored StandingTile and introduced LastTile 2016-01-11 02:28:09 -05:00
PikalaxALT 3dcbe0ff55 Pokegear 2016-01-10 17:44:09 -05:00
PikalaxALT 8360a1a2e8 Pokegear functions and RAM labels 2016-01-09 23:41:03 -05:00
YamaArashi b609a1690d pokedex unown mode 2016-01-09 19:46:41 -08:00
YamaArashi 418c84dc0c pokedex 2 2016-01-09 19:03:38 -08:00
YamaArashi e033ea3a37 commented pokedex more 2016-01-09 17:51:14 -08:00
PikalaxALT f7ee74c3b8 Finish labels in engine/namingscreen.asm 2016-01-09 19:34:14 -05:00
PikalaxALT 6d1b7f28c8 Split base stats 2016-01-09 16:52:34 -05:00
PikalaxALT 61c4cfe7d7 wram macros moved to new file 2016-01-07 18:45:32 -05:00
PikalaxALT 69af99da5e Mr Pokemons House 2016-01-06 16:59:56 -05:00
PikalaxALT ce019e6347 Map callback constants 2016-01-06 07:44:50 -05:00
PikalaxALT 80aba7fc13 maptrigger macro 2016-01-05 08:46:37 -05:00
PikalaxALT c087d44c42 more gfx-related labels 2016-01-04 08:43:55 -05:00
PikalaxALT 9bbb65166e More movement stuff 2015-12-29 13:15:58 -05:00
PikalaxALT a2a2668233 Dummy Game 2015-12-28 17:09:53 -05:00
PikalaxALT 2bd45ca574 Move effects; no more reloadmapmusic, returnafterbattle 2015-12-26 19:22:27 -05:00
PikalaxALT f485a45cda More mobile-related labels; remove unneeded map object constants 2015-12-26 12:01:21 -05:00
PikalaxALT 7683b78fb4 Labels relating to odd egg 2015-12-25 23:34:33 -05:00
PikalaxALT a5e928eb98 writebackup --> closewindow; game corner prize vendors; others 2015-12-24 22:58:42 -05:00
PikalaxALT 2a2222476a Split up anim objects into several files 2015-12-24 14:07:33 -05:00
PikalaxALT c4e3e980b1 More labels related to battle anims 2015-12-23 22:51:50 -05:00
PikalaxALT d7a5ea998d More battle anims and bg effects 2015-12-23 20:46:23 -05:00
PikalaxALT 8152ab612c Battle anims 2015-12-23 17:10:50 -05:00