Commit Graph

342 Commits

Author SHA1 Message Date
surskitty
b37cc569be Radio Card local jumps 2018-02-02 11:30:16 -05:00
surskitty
ddd0b6f958 Jasmine and Amphy labels 2018-02-02 11:13:28 -05:00
surskitty
f1e4951cf1 Sailor Huey labels 2018-02-02 11:02:31 -05:00
surskitty
b94c1f7084 Labelling the Victory Road rival script 2018-02-02 10:57:06 -05:00
surskitty
b53b03eed0 Labelling Buena's subroutines. 2018-02-01 23:39:14 -05:00
surskitty
ae909428ae Incomplete labelling 2018-02-01 23:30:17 -05:00
surskitty
8874ec7252 Completing labels for Route 35. 2018-01-23 23:49:50 -05:00
surskitty
b25e5626a1 Renaming the UnknownScript for reloading the map after battle. 2018-01-23 23:49:15 -05:00
surskitty
076e604387 Labelling some more UnknownScripts. These files remain incomplete. 2018-01-23 23:40:25 -05:00
surskitty
fbc6fe4722 Merge branch 'master' of github.com:pret/pokecrystal 2018-01-23 00:02:56 -05:00
Remy Oukaour
05382d3e3c PARTY_LENGTH; MON_NAME; sgb_border.bin 2018-01-20 12:25:55 -05:00
Remy Oukaour
8127d1fbcf Rename BATTLETOWER_NROF constants 2018-01-20 12:05:16 -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
e69544b61f More Unicode 2018-01-19 02:30:19 -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
c70e8eec49 Comment on changeblock ids 2018-01-17 13:23:43 -05:00
Remy Oukaour
bf074f3598 map_header → map_def; map_header_2 → map_data 2018-01-16 23:25:00 -05:00
Remy Oukaour
94bbfe2f0c Move map-related "metadata" files into data/maps/ 2018-01-16 19:56:21 -05:00
surskitty
4162705db9 Cooltrainerm Kevin 2018-01-16 13:35:33 -05:00
surskitty
fb02e4bde5 Birdkeeper Jose and Cooltrainerf Reena 2018-01-16 13:26:13 -05:00
surskitty
d588033748 Route 35 local labels 2018-01-15 23:30:39 -05:00
surskitty
115a5c236d Changing labels to local. 2018-01-15 23:23:04 -05:00
surskitty
c167c81611 Fisherman Tully labels 2018-01-15 23:09:56 -05:00
surskitty
9ce97c82d4 Route 43 labels 2018-01-15 23:02:39 -05:00
surskitty
3734a43062 Route 45 labels 2018-01-15 22:52:19 -05:00
surskitty
f14d0d8f21 Route 26 labels 2018-01-15 22:25:11 -05:00
surskitty
40952508c2 Renaming again 2018-01-15 22:19:17 -05:00
surskitty
d837c7609a Labelling Route 46's wrappers. 2018-01-15 22:02:01 -05:00
surskitty
2548f75feb Disambiguating the wrapper functions. 2018-01-15 21:59:48 -05:00
surskitty
d53881a0d4 Picnicker Erin labels 2018-01-15 21:39:07 -05:00
surskitty
e8d651b79a Saffron City guard labels 2018-01-15 21:32:31 -05:00
surskitty
3e0cac29e3 Route 5 Cleanse Tag granny labels 2018-01-15 21:28:42 -05:00
surskitty
b098816b46 Labelling Route 44; Birdkeeper Vance and Fisher Wilton. 2018-01-15 21:23:32 -05:00
surskitty
1aae9eb528 Labelling simple local jumps. 2018-01-15 21:14:48 -05:00
Remy Oukaour
fe3ef73a8c Group unused data 2018-01-15 00:44:40 -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
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
Remy Oukaour
eb3102200f More Battle Tower map script constants, fewer raw hex values 2018-01-14 19:26:55 -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
3db107b721 Label Dragon Shrine 2018-01-13 10:25:02 -05:00
Remy Oukaour
b28e71271d Consistent stonetable cmdqueues 2018-01-13 01:03:42 -05:00
Remy Oukaour
5a3822fe86 Introduce callback, hiddenitem, conditional_event, and cmdqueue macros for map scripts 2018-01-13 00:47:38 -05:00
Remy Oukaour
59c95abf83 Trim whitespace 2018-01-12 17:09:32 -05:00
Remy Oukaour
2b4a4ccaab SaffronMagnetTrainStation 2018-01-12 02:33:06 -05:00
Remy Oukaour
d83aefb30a Use more constants in scripts 2018-01-12 02:27:42 -05:00
Remy Oukaour
cc8dac5a22 Use constants and data for Unown chamber events 2018-01-11 00:25:14 -05:00
Remy Oukaour
0a3b251dcb Arrays end with -1, not $ff 2018-01-10 22:53:42 -05:00
Remy Oukaour
2f0973f3e0 Clean up some hex values in map scripts 2018-01-09 18:45:25 -05:00