Rooba
/
pokecrystal
mirror of https://github.com/pret/pokecrystal.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,020 Commits 2 Branches 0 Tags 193 MiB
Commit Graph

668 Commits

Author SHA1 Message Date
Rangi a73ced3b69 unused_dark_cave -> unused_johto (goes with the beta Johto town+city maps) 2020-02-25 19:18:24 -05:00
Rangi 88bbdb6a2f Define TileCollisionTable as a standard 'db' series 2020-02-13 19:07:19 -05:00
Rangi fb9cbe7d1e
Merge pull request #650 from pret/audio-macros 
Update audio macros and arguments
 2020-02-05 18:51:20 -05:00
Rangi 24a23b1922 Use CMDQUEUE constants 2020-02-04 11:11:43 -05:00
Rangi d482dc28f4 Identify four padding bytes in base data as beta front/back pic pointers 2020-02-04 11:07:16 -05:00
dannye e7be25948d Merge branch 'master' into audio-macros 2020-01-06 22:07:33 -06:00
mid-kid 739a60b33c Make the map setup commands match the actual function names better 
These functions used as map setup commands are used in other places,
too, so I can't prefix them under the same. The names should match
except I won't repeat "map" in a map setup command name.
 2019-11-18 18:21:57 +01:00
mid-kid 77803f571f Fix some constants around wLinkMode 2019-11-18 18:21:57 +01:00
Rangi 4d32035d4f Bit 6 of PrintNum left-aligns numbers 2019-11-03 20:17:04 -05:00
Rangi 717cf3f458 Identify PLAYERMOVEMENT_* constants 2019-11-03 14:30:33 -05:00
Rangi 5134266b9a Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH 2019-11-03 12:26:38 -05:00
Rangi 01f68fcc6a Rename TILESET_BATTLE_TOWER to TILESET_BATTLE_TOWER_INSIDE 2019-11-03 12:03:37 -05:00
mid-kid 86061d37d2 More mobile SDK documentation 
Labelled WRAM addresses, added constants for mobile commands, fixed some
mobile lib function names, documented most of the functions for specific
commands.
 2019-10-21 00:42:36 +02:00
mid-kid 1f172badc4 Misc fixes 2019-10-21 00:31:50 +02:00
Ryan Tandy 3fc2ba41f7 Clarify naming of SFX_GET_EGG_* pointers 
In game, one receives eggs from the Aide and the Day-care Man, not the
Day-care Lady. SFX `0x96` is used for both. Rename it to reflect it is
not unique to the Day-care.

SFX `0x95` is an alias of the same sound and appears to be unused.
Rename the pointer to clarify that.
 2019-09-23 10:03:19 -07:00
dannye fc051f2130 Update audio macros and arguments 
and update related labels/constants/comments
this fixes a lot of mistakes and maximizes compatibility with red
 2019-09-02 03:41:25 -05:00
mid-kid c048b24d25 Create constants for ScrollingMenu item formats 
...I should've done this quite a while ago.
 2019-06-09 02:31:24 +02:00
mid-kid 476f9ba40d Define appropriate constants as EQU 
These constants are defined only once and shouldn't be redefined anyway.
 2019-05-25 17:59:50 +02:00
mid-kid 13cfe356d6 Fix usage of rIE and rSC constants 2019-05-25 17:59:50 +02:00
Rangi b24cd55f96 Correct the older+younger haircut brothers' labels and constants 2019-05-18 13:27:32 -04:00
Rangi 7890fae995 Some more GB Printer documentation 2019-05-11 13:01:59 -04:00
mid-kid 3e78e5b2b6 TextBox -> Textbox 
Homogenizing names.
 2019-04-09 16:09:18 +02:00
Rangi 2184b60a0c Identify and eliminate wEngineBuffer1-5 2019-04-08 19:42:55 -04:00
Rangi e002b536af Rename more script commands for consistency and predictability 
Fixes #540
 2019-03-10 16:00:19 -04:00
Rangi d46685be86 Correct comments 2019-03-03 17:13:24 -05:00
Rangi 79dc22c769 Define constants for map event sizes 2019-03-03 14:19:16 -05:00
Rangi dc396822d7 Identify more collision-related constants and data 2019-03-03 13:30:27 -05:00
mid-kid 7d6befa181 Fix issues in review 2019-02-16 19:08:34 +01:00
mid-kid 80ece33e3e Document wBattleAnimFlags 
`anim_clearsprites` was misnamed, so I renamed it to `anim_keepsprites`,
and documented it in docs/battle_anim_commands.md
 2019-02-16 12:55:40 +01:00
mid-kid 7e93916c8a Add more constants for battle anim structs 
Any access of the wram arrays for battle anim objects and background
effects use appropriate macros and constants, now.
 2019-02-16 01:43:12 +01:00
mid-kid bfedd89308 BATTLEANIMSTRUCT_0B -> BATTLEANIMSTRUCT_PARAM 
This structure member is used for storing the parameter passed to
`anim_obj`.
 2019-02-06 08:12:52 +01:00
Rangi 9ecc991814
Merge pull request #593 from mid-kid/temp 
More patches
 2019-01-24 21:42:44 -05:00
Rangi 79ea091ff6 Use and define more WRAM constants 2019-01-24 21:41:14 -05:00
Rangi 68d4a53483 Use more constants 2019-01-24 21:15:30 -05:00
mid-kid 5f60cc24cf Fix some constants 
Glass ting SFX were added in crystal.
PicAnimations and UnownAnimations are expected to be in the same bank as
their pointers, because the pointers are not BANK()-referenced
separately.
 2019-01-15 13:06:16 +01:00
Rangi b975f3e068 Clean up some Odd Egg and Battle Tower code and data 
Fixes #589
 2019-01-02 19:04:50 -05:00
mid-kid c4979d9770 Rename "feet and head follow" commands 
The lot of these were rather misnamed, since they're used to replace
part of the player or enemy with objects for several background effects.
https://github.com/pret/pokecrystal/pull/578#issuecomment-440996244
 2018-11-25 23:57:38 +01:00
mid-kid 2746288030 Define ANIM_GFX for PLAYER and ENEMY 
These are used where the head or the feet of the player/enemy have to be
moved in an animation, and shouldn't overlap. These aren't actual GFX
and should be loaded with the proper commands, and they're always loaded
at the end of the VRAM area.

Furthermore, I've defined BATTLEANIM_BASE_TILE, which is the tile from
which battle animation graphics may start to load. This value was picked
to make sure at least an entire pokemon pic fits in the area before it,
even though it doesn't seem very used...
 2018-11-21 23:44:31 +01:00
mid-kid 725cee7371 Define first_music_cmd 
This replaces the uses of $d0 in the audio engine with proper constants.
 2018-11-21 12:12:22 +01:00
mid-kid 4e3ed078f9 Cosmetic fixes 2018-11-20 21:53:45 +01:00
Rangi 81b147609c Apply SPRITE_GFX_LIST_CAPACITY to wUsedSprites 2018-10-27 20:21:00 -04:00
Rangi 31ec3365e9 NUM_OBJECTS EQU $10 → 16 2018-10-23 18:29:14 -04:00
Rangi 3b20a18200 Identify BATTLEACTION_D and _E (thanks, ax6) 2018-10-21 00:52:10 -04:00
IIMarckus 603524b489 This event isn't Crystal-exclusive. 2018-10-03 00:53:04 -06:00
Rangi 2e7e5ca67b PREDEFPAL_4D -> PREDEFPAL_GAMEFREAK_LOGO_OB 2018-09-22 13:40:37 -04:00
Rangi 38bf21ae35 Naming screen constants 2018-09-22 12:39:17 -04:00
Rangi 60b09f291d Merge branch 'master' of https://github.com/pret/pokecrystal 2018-09-16 13:42:17 -04:00
Rangi 03cb8c53f1 Identify some Spaceworld beta content 2018-09-16 13:40:47 -04:00
mid-kid 3540b2a2d6 wMonStatusFlags -> wDebugFlags 2018-09-16 02:15:55 +02:00
Rangi ae022e1420 Curr -> Cur 2018-09-09 15:09:51 -04:00
Rangi 39faa7a9f6 Update file paths in comments 2018-08-19 13:33:35 -04:00
mid-kid f98a95b8ee wWeeklyFlags -> wDailyFlags2 
These are by far not always checked each week, and as such shouldn't be
called that.
Since they're almost always used through the `bit` instruction, it's
very inconvenient to just make wDailyFlags a `dw` instead.
 2018-08-07 09:46:21 +02:00
Rangi 9dec80b07e Add meaningful aliases for wd265 
Introduce MONICON_* constants
Introduce BATTLEPLAYERACTION_* constants
 2018-07-29 00:25:52 -04:00
Rangi 9a1ae1332c Correct NUM_STATS 2018-07-24 22:54:15 -04:00
Rangi bdde60c64b ANIM_MON_UNUSED → ANIM_MON_HOF 2018-07-22 23:42:50 -04:00
mid-kid 23708441ef Make proper cmdqueue constants 2018-07-18 10:55:30 +02:00
Rangi a70624adfb Correct wTradeFlags length 2018-07-13 17:18:19 -04:00
Rangi 874bc5ebd5 SFX_UNKNOWN_7F → SFX_TOXIC 2018-07-12 12:25:17 -04:00
Rangi 187e30cac8 Replace more hex values with constants or decimal 2018-07-11 15:40:09 -04:00
Rangi 90b22d602f Use more options constants 2018-07-10 17:18:23 -04:00
Rangi d3e942a8fe More LCDC bit constants 2018-07-05 22:00:13 -04:00
Rangi e2cf3eb7bd Add more collision nybble constants 2018-06-28 22:35:29 -04:00
Rangi 67d1364c7a Fix triple newlines left over from removing address comments 2018-06-24 23:22:50 -04:00
Rangi 5a58f90ec6 FISHGROUP_DATA_LENGTH 2018-06-24 11:46:55 -04:00
Rangi e36a505906 Separate Mart constants from item data constants 2018-06-23 22:24:46 -04:00
mid-kid aecb33f104 Alignment 2018-06-04 18:32:57 +02:00
mid-kid e8f847b537 Use structure constants for channel_struct 2018-06-04 11:35:27 +02:00
Rangi 4df72a8474 SGB palette roles discovered from Spaceworld beta G/S 2018-06-01 02:11:44 -04:00
Rangi 1840af8b4f Identify more sprite move data flag bits 2018-05-23 22:01:21 -04:00
Rangi 85f7328bf8 Identify USE_OBP1_F 2018-05-23 20:44:32 -04:00
Rangi 50ea6d6e22 WALKS_ON_WATER → SWIMMING 2018-05-23 19:10:15 -04:00
Rangi c85b32ed80 More sprite movement data flag constants 2018-05-23 19:06:04 -04:00
Rangi c5d18de8ff Use known sprite movement data flag constants 2018-05-23 13:15:07 -04:00
Rangi 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
Rangi e1fabcfbff Fix comments 2018-05-18 19:36:22 -04:00
Rangi 8acc8d6e30 Merge branch 'master' of https://github.com/pret/pokecrystal 2018-05-06 22:45:07 -04:00
Rangi e5d4f741ee Keep macros near relevant data 2018-05-06 15:56:42 -04:00
mid-kid acdb302035 Fix rest of the givepokeitem/checkpokeitem references 2018-05-06 13:48:04 +02:00
Rangi de0b344be4 Explicit NO_LIMITS instead of 0 2018-05-05 19:19:51 -04:00
mid-kid 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
yenatch 40b537d45b
Merge pull request #503 from Rangi42/master 
Factor wMisc into meaningful parts; move most code out of home.asm
 2018-04-09 21:30:24 -04:00
Rangi 53ff57ca66 Correct map constant comments 2018-04-09 18:58:10 -04:00
Rangi 7307fc8dce Use constants for bit/set/res more 2018-04-05 11:44:02 -04:00
mid-kid 2d8f3a0654 Use Stadium 2 Egg Group names 
Out of the current two most prevalent official conventions, this one was
chosen, because they're used in a direct counterpart to this game, and
thus feel more accurate.
 2018-04-05 07:54:20 +02:00
mid-kid 1891879b62 GENDERLESS -> GENDER_UNKNOWN 
This is how they're called in official sources, and it fits better with
the other `GENDER_` constants.
 2018-04-05 07:54:20 +02:00
Rangi 81306889e3 Merge branch 'master' of https://github.com/pret/pokecrystal 2018-04-04 23:56:40 -04:00
mid-kid 38107209a6 Update docs and comments to reflect renames 2018-04-04 23:44:24 +02:00
Rangi 145efc1353 Use constants for screen size in metatiles 2018-04-04 16:14:48 -04:00
mid-kid 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
mid-kid 91a768b243 Update file paths in constants/ and docs/ 2018-04-01 17:01:51 +02: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 7e9dbde549 HOF_MASTER_COUNT EQU 200 2018-03-04 00:27:22 -05:00
Rangi bde9ffff6e Improve some code labels 2018-03-02 19:39:16 -05:00
Rangi 5959548c01 Document HOF Master bug (close #494) 2018-02-26 11:51:16 -05:00
Rangi 7453bd1aa8 "HUMANSHAPE, aka Humanshape" 2018-02-25 22:38:09 -05:00
Rangi b254a4571d ENGINE_BUG_CONTEST_ON -> ENGINE_MAIN_MENU_MOBILE_CHOICES (resolves #490) 
Went with CHOICES instead of HIDDEN since setting the flag would presumably have shown the items, not hidden them
 2018-02-25 22:23:20 -05:00
Rangi 2f9a0d7d9f Pokecom Center Admin Room -> Office 2018-02-25 22:19:17 -05:00
Rangi 409fd9d33f Comment Stadium 2 alternative egg group names 2018-02-25 22:11:32 -05: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
Rangi 60add76ee7 * Remove rept 4 (fa3192e) 
* FindGreaterThanThatLevel -> FindAboveLevel (132fe46)
* More meaningful egg group names (0eeb00d)
 2018-02-25 19:23:01 -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 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
mid-kid c3abe8f88b mapconst H, W -> map_const W, H 
We've been fixing all of the conventions to be X/Y and W/H, so we should
fix this one as well.
 2018-02-14 11:52:01 +01: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
Rangi 323ef81286 More comments and macros 2018-02-01 15:19:27 -05:00
Rangi b2970e75f4 SCENE_DEFAULT=0 and SCENE_FINISHED=1 (generic constants for a common scene pattern) 2018-02-01 15:06:06 -05:00
Rangi b54a7b7795 Quick scene explanation 2018-02-01 13:08:30 -05:00
Rangi fcfe77bc3d Meaningful scene constant names 
(Two common patterns: 0=default event and 1=nothing; and 0=nothing and 1=some event)
 2018-02-01 13:03:21 -05:00
Rangi 936a170e0d MobileTradeRoom matches MobileBattleRoom 2018-01-31 23:21:15 -05:00
Rangi a17623d96b Add scene ID constants (TODO: meaningful names) 2018-01-31 23:16:51 -05:00
Rangi 7d6e82ef1c NPC trade constants don't all just start with TRADE_ 2018-01-31 21:16:57 -05:00
Rangi 0eeb00d6ac Official egg group names 2018-01-31 12:03:43 -05:00
Rangi b8f4b1b8a7 MINERAL egg group works 2018-01-31 11:45:18 -05:00
Rangi 08891da822 const_def N 2018-01-31 11:38:45 -05:00
Rangi a2607623d3 Comment the person constants sections, like the others 2018-01-31 11:04:17 -05:00
Rangi a9334f7468 Correct engine flag constants 2018-01-31 10:55:35 -05:00
Rangi 1282405d4a SPRITEMOVEDATA_LAPRAS → SPRITEMOVEDATA_SWIM_WANDER 
(more precise, and encourages hacks to add more SWIM movements)
 2018-01-30 22:42:41 -05:00
Rangi 006d9f6441 Clarify big doll-related constants (Snorlax and Lapras are symmetrical, Onix is not) 2018-01-30 22:34:05 -05:00
Rangi cb733954c6 SPRITEMOVEDATA_ITEM_TREE → SPRITEMOVEDATA_STILL (it's used for other things like Azalea's Slowpokes, not just items and trees) 2018-01-30 22:12:53 -05:00
Rangi 3df4c5ffa8 Group related constants together 2018-01-27 00:17:25 -05:00
Rangi 3332305bb4 Define more bit flag constants 2018-01-26 12:27:02 -05:00
Rangi f1366d615f Separate map object constants for easier editing 2018-01-26 12:06:33 -05:00
Rangi 662b3459f6 Correct comments 2018-01-25 22:22:25 -05:00
Rangi 6ebe45e41f Move event data to data/events/ 2018-01-25 22:19:24 -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 7d3ad2136a Separate home/battle_vars.asm for easy data editing, same as home/hm_moves.asm 2018-01-25 18:10:41 -05:00
Rangi dcc0ca9b83 Move some more constants out of misc_constants.asm 2018-01-25 17:30:13 -05:00
Rangi 0380c2a493 Move some more constants out of misc_constants.asm 2018-01-25 17:00:31 -05:00
Rangi d719d318e8 Remove Special_ prefix from special routines (close #478) 2018-01-24 11:17:05 -05:00
Rangi 505a6595bc EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481) 2018-01-24 10:46:49 -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 517eab6526 "Speech" houses just have dialog NPCs 2018-01-23 12:54:17 -05:00
Rangi c5cc23a35f wGameTimerPause bit flag constants 2018-01-23 12:40:29 -05:00
Rangi fdda670f40 Cry headers and map headers were eliminated 2018-01-23 11:17:21 -05:00
Rangi 94ae404732 Separate data/mon_menu.asm 2018-01-23 10:46:26 -05:00
Rangi fc61d58dc4 Rename some more maps 
The Pokécom Center's .blk contains 1F and the Administration room, but the .asm script is just for the Admin room; 1F-related text and scripts are in GoldenrodPokecenter1F.asm. Presumably both map scripts shared the same .blk.
 2018-01-23 01:03:47 -05:00
Rangi 14cb5a3cb0 EcruteakHouse → EcruteakTinTowerEntrance 2018-01-23 00:30:07 -05:00
Rangi 0261bd2ff5 Daisy offers "grooming", not "massage" 2018-01-23 00:11:23 -05:00
Rangi 14ef9d3066 PALETTE_SIZE 2018-01-22 19:57:35 -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 7f187be36c Don't say "House" twice 2018-01-22 18:29:21 -05:00
Rangi f44b7ad5c3 Add data/text/ 2018-01-22 17:33:52 -05:00
Rangi cb5e3378de Move type data to data/types/ 2018-01-22 16:23:34 -05:00
Rangi efe6981a0d Add daily+weekly bit flags (close issue #429) 2018-01-22 15:59:24 -05:00
Rangi 3a7f518de4 wStatusFlags/2 bit constants 2018-01-22 15:40:43 -05:00