pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity
4,047 Commits 1 Branch 0 Tags 52 MiB
fdf10c9fac
Commit Graph

420 Commits

Author SHA1 Message Date
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
08891da822 const_def N 2018-01-31 11:38:45 -05:00
Rangi
50a78c0876 Forgot the person→object rename 2018-01-31 11:08:47 -05:00
Rangi
a2607623d3 Comment the person constants sections, like the others 2018-01-31 11:04:17 -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
72cdcb621c Merge branch 'master' of https://github.com/pret/pokecrystal 
# Conflicts:
#	maps/Route25.asm
#	maps/Route27.asm
#	maps/Route35.asm
#	maps/Route39.asm
#	maps/Route42.asm
#	maps/Route43.asm
#	maps/Route43MahoganyGate.asm
#	maps/Route45.asm
#	maps/Route5CleanseTagHouse.asm
#	maps/Route6SaffronGate.asm
#	maps/Route7SaffronGate.asm
#	maps/ViridianCity.asm
 2018-01-30 22:01:20 -05:00
Rangi
6e00101b89 Comment values of special pointers, same as predefs 2018-01-30 14:55:27 -05:00
Rangi
65480605e9 Remove unreferenced map script heading labels 2018-01-30 14:15:47 -05:00
Rangi
477adc72af grep -rl warp_def . | xargs sed -i s/warp_def/warp_event/g 2018-01-28 13:20:04 -05:00
Rangi
518dd46ca1 data/text/X_text.asm is redundant 2018-01-24 21:27:23 -05:00
Rangi
d719d318e8 Remove Special_ prefix from special routines (close #478) 2018-01-24 11:17:05 -05:00
Rangi
132fe46925 Rename some routines to avoid conflicts when removing "Special_" prefixes 2018-01-24 11:12:02 -05:00
Rangi
505a6595bc EVENT_TEMPORARY_UNTIL_MAP_RELOAD_[1-8] (close issue #481) 2018-01-24 10:46:49 -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
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
8f2878c37e trainers put the class and id first: trainer YOUNGSTER, JOEY1, ... 2018-01-23 13:08:48 -05:00
Rangi
dea26c6639 hiddenitem, like itemball and object_event, puts the item first and the event last 2018-01-23 12:59:21 -05:00
Rangi
b88928e9aa Missed a file 2018-01-23 12:55:02 -05:00
Rangi
517eab6526 "Speech" houses just have dialog NPCs 2018-01-23 12:54:17 -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
surskitty
fbc6fe4722 Merge branch 'master' of github.com:pret/pokecrystal 2018-01-23 00:02:56 -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
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
7cef012335 wUnlockedUnowns engine flag constants 
Use local labels for "End"ings
 2018-01-22 13:00:35 -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
Remy Oukaour
31edd7f803 Move text/ into data/ 2018-01-09 00:23:48 -05:00
xCrystal
91f97f08f0 Special_MapCallbackSprites_LoadUsedSpritesGFX -> Special_LoadUsedSpritesGFX 2018-01-03 14:58:08 +01:00
xCrystal
aa9a0a900d No more mobile EQUS ret (replace with Stubbed_ + ret) 2018-01-02 20:00:14 +01:00
xCrystal
b4e087167f More unreferenced labels and unused text 2018-01-02 19:38:56 +01:00
xCrystal
d7970f749a Consistent predef function names 2018-01-02 18:49:25 +01:00
xCrystal
b4a49351c1 Finish consistent Special function names 2018-01-02 17:47:58 +01:00
xCrystal
f1ea15bbfe Consolidate Special function names 2018-01-02 17:13:57 +01:00
xCrystal
6f0b81504d More unreferenced labels cleanup 2018-01-02 16:04:21 +01:00
Remy Oukaour
eb8e55a01a Route 17-18 Gate and Route 29-46 Gate 2018-01-01 18:19:32 -05:00
Remy Oukaour
985946740e Consistent map naming ("Town" and "City" are left out in houses and gates) 2018-01-01 18:08:18 -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
50fc9c3389 endm -> ENDM 2017-12-28 22:31:16 +01:00
Remy Oukaour
84e22eb578 Consistent (x, y) coordinate formatting in map scripts 2017-12-28 14:31:25 -05:00
xCrystal
7beb497d3a Uppercase MACRO and EQU(S) according to the style guide 2017-12-28 13:23:44 +01:00
Remy Oukaour
06857bc222 benny → Benny 2017-12-27 18:45:57 -05:00
Remy Oukaour
2a565f747c Fix #432: Bird_keeper → BirdKeeper, Bug_catcher → BugCatcher 2017-12-26 20:42:12 -05:00
Remy Oukaour
35a3a19fda Use "battle_anims" and "sprite_anims" for clarity, not just "anims" 2017-12-26 18:45:04 -05:00
surskitty
3165b9e0d3 I'm stopping for the day. Too many silly oversights. 2017-12-25 15:15:32 -05:00
surskitty
58b3514915 Now all labelled SlowpokeWellB1F. 2017-12-25 15:11:39 -05:00
surskitty
1a9f190065 Shhh no one saw that. 2017-12-25 15:07:40 -05:00
surskitty
c13b7af4f5 Disambiguating granddaughter + grandpa #426 2017-12-25 15:06:14 -05:00
surskitty
79d9f16237 Renaming Slowpoke. 2017-12-25 15:01:50 -05:00