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

237 Commits

Author SHA1 Message Date
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 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
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
Rangi 7cef012335 wUnlockedUnowns engine flag constants 
Use local labels for "End"ings
 2018-01-22 13:00:35 -05:00
Rangi 6ecf18aa52 Engine flag bit constants for wPokegearFlags 2018-01-22 12:03:18 -05:00
Rangi 9e8f33d605 Cleaner roammon and treemon data 2018-01-22 11:30:17 -05:00
Remy Oukaour b071dd364f Japanese characters in Japanese text (e.g. "ォ" not "," for $f4) 2018-01-19 21:49:16 -05:00
Remy Oukaour ddec0ee305 More Japanese characters 2018-01-19 20:48:33 -05:00
Remy Oukaour e69544b61f More Unicode 2018-01-19 02:30:19 -05:00
Remy Oukaour 25048bd12d wiggle → wobble 2018-01-19 00:16:08 -05:00
Remy Oukaour 0082dcdd62 Missing comment 2018-01-18 22:38:20 -05:00
Remy Oukaour a9f8aeb94e Remove trailing whitespace 2018-01-18 21:48:52 -05:00
Remy Oukaour 17336221e6 newline before para 2018-01-18 21:15:59 -05:00
Remy Oukaour a3beba1e64 Use Japanese charmap definitions in strings 2018-01-18 20:49:17 -05:00
Remy Oukaour 2acaa96cf1 More charmap and home/text.asm documentation for JP chars 2018-01-18 18:34:20 -05:00
Remy Oukaour 226d1812b3 Only graphics data goes in gfx/ 
Introduce PALRGB_WHITE constant for $7fff
 2018-01-18 11:16:24 -05:00
Remy Oukaour b1c808f9f8 Rename some tilesets (close #467) 2018-01-17 14:50:34 -05:00
Remy Oukaour faa41e743b hex->dec 2018-01-17 12:49:21 -05:00
Remy Oukaour f64443a504 Wild data entries are 2 bytes wide 2018-01-17 12:45:16 -05:00
Remy Oukaour e2ac753da1 No redundant filename prefixes 2018-01-17 00:00:43 -05:00
Remy Oukaour 3dcc0066a5 Comments help find map_data.asm 2018-01-16 23:55:33 -05:00
Remy Oukaour bf074f3598 map_header → map_def; map_header_2 → map_data 2018-01-16 23:25:00 -05:00
Remy Oukaour 3d0e1819e9 0/1 → FALSE/TRUE, with correct comment 2018-01-16 20:56:08 -05:00
Remy Oukaour 94bbfe2f0c Move map-related "metadata" files into data/maps/ 2018-01-16 19:56:21 -05:00
Remy Oukaour 01ba6bed88 Move code out of data/ 2018-01-16 18:07:06 -05:00
Remy Oukaour 7b3de85a06 Avoid "+- 1" at every maskbits 2018-01-16 17:27:50 -05:00
Remy Oukaour 8048082114 Remove Predef_ prefix from routines listed in PredefPointers 2018-01-16 14:39:28 -05:00
Remy Oukaour 2b82338920 Phone data 0/7 are time masks 2018-01-15 22:00:56 -05:00
Remy Oukaour 9fb74161e5 Comments 2018-01-15 14:39:53 -05:00
Remy Oukaour 6c7e88513a Long lists of db/dw series with struct-defining macros belong in data/ 2018-01-15 14:11:11 -05:00
Remy Oukaour fe3ef73a8c Group unused data 2018-01-15 00:44:40 -05:00
Remy Oukaour 07b8fe2983 G/S does use this OAM data: https://i.imgur.com/KdIhKKk.png 2018-01-15 00:21:41 -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
Remy Oukaour 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
mid-kid 11d67567d2 Use constants for menu flags 
Added a bunch of constants for the bitflags of each kind of menu. Some
are slightly vague or too long, but I'm not sure how to else name them.
 2018-01-14 11:59:56 +01:00
Remy Oukaour 2ab60fa8a4 menu_coords macro for (x1, y1, x2, y2) order (see issue #440) 2018-01-13 16:38:14 -05:00
Remy Oukaour d054116458 Merge branch 'patch' of https://github.com/mid-kid/pokecrystal 
# Conflicts:
#	constants/sprite_anim_constants.asm
#	data/sprite_anims/framesets.asm
#	data/sprite_anims/oam.asm
 2018-01-12 17:23:50 -05:00
Remy Oukaour bc22bf2627 Egg palette works like other Pokémon 2018-01-12 15:06:25 -05:00
Remy Oukaour 960783cdf4 Label more ANIM_OBJ_* constants 2018-01-12 13:47:04 -05:00
mid-kid 5b7773b7d3 Label frameset 09 
It seems to be used as the "big" text entry cursor (i.e. for the bottom
3 buttons in the text entry screen).
It is never referenced explicitly, instead used when adding 1 to
SPRITEANIMSTRUCT_0E, in NamingScreen_AnimateCursor.
 2018-01-12 12:17:55 +01:00