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
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
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
0c6338836d
Resolve #471 (although link code still needs more cleanup, like its WRAM labels)
2018-01-19 14:49:43 -05:00
Remy Oukaour
c861ff5af3
This table entry has the address of MoveDescriptions in GSC ($4000 in G/S, $4b52 in Crystal)
2018-01-19 00:42:31 -05:00
Remy Oukaour
9576740b70
clean up GetName/NamesPointers
2018-01-19 00:29:05 -05:00
Remy Oukaour
25048bd12d
wiggle → wobble
2018-01-19 00:16:08 -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
d82127b23c
SGB MON_NITE colors
2018-01-18 16:19:09 -05:00
Remy Oukaour
72c4f9e04a
More constants, related to map objects
2018-01-18 15:58:55 -05:00
Remy Oukaour
3bf8325edd
More accurate constant/label names
2018-01-18 15:06:43 -05:00
Remy Oukaour
69ace7f48d
Identify leftover SGB palettes from R/B
2018-01-18 12:31:19 -05:00
Remy Oukaour
22fd1221f5
More .pal files
2018-01-18 11:37:05 -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
0306e94cc3
More SGB documentation
2018-01-18 00:16:03 -05:00
Remy Oukaour
c5d9ecae9c
More SGB documentation
2018-01-17 22:48:57 -05:00
Remy Oukaour
4161ec98b4
Partially document SGB data from pokered
2018-01-17 22:37:04 -05:00
Remy Oukaour
b1c808f9f8
Rename some tilesets ( close #467 )
2018-01-17 14:50:34 -05:00
Remy Oukaour
8f092adf41
mapgroup → mapconst
2018-01-17 00:07:05 -05:00
Remy Oukaour
e2ac753da1
No redundant filename prefixes
2018-01-17 00:00: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
Remy Oukaour
7b3de85a06
Avoid "+- 1" at every maskbits
2018-01-16 17:27:50 -05:00
Remy Oukaour
2b82338920
Phone data 0/7 are time masks
2018-01-15 22:00:56 -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
8e1e583640
Close #470 (JOHTO_POKEMON)
2018-01-14 20:58:49 -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
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
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
Remy Oukaour
bdc95598d7
Easier to find palette data
2018-01-12 03:07:48 -05:00
Remy Oukaour
1f5cc28db7
Comment on VAR_* constants
2018-01-12 02:36:14 -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
af4001132e
Break up engine/events_3.asm
2018-01-11 23:50:44 -05:00
Remy Oukaour
2085ebcc61
maskbits for NUM_FRAMES
2018-01-11 23:04:50 -05:00
Remy Oukaour
163f3e0c3f
Local UI tiles don't belong in charmap
...
Separate 1bpp font tiles from gfx/mobile/phone_tiles.png
2018-01-11 22:49:45 -05:00
Remy Oukaour
17f34cb29c
Disambiguate some uses of wcf64/5/6
2018-01-11 15:36:11 -05:00
Remy Oukaour
94d6a32721
Use maskbits some more
2018-01-11 14:27:19 -05:00
Remy Oukaour
a436bbc23b
Move party menu qualities to data/
2018-01-11 02:54:07 -05:00
Remy Oukaour
1a2bc57841
Event script–related constants go in constants/script_constants.asm
2018-01-11 02:35:46 -05:00
Remy Oukaour
b45f89f80c
More constants and data tables
2018-01-11 01:45:27 -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
d91e42ca5e
Group some mutually edited files in data/sprites/
2018-01-10 18:10:01 -05:00
Remy Oukaour
c8575823a0
Battle data goes in data/battle/
...
TreeMons, like fish groups, have constants
2018-01-10 17:30:27 -05:00
Remy Oukaour
bc79f17b9d
More maskbits
2018-01-10 13:59:07 -05:00
Remy Oukaour
417937cffc
Resolve #461
2018-01-10 13:47:57 -05:00
Remy Oukaour
cc95d1208d
Use maskbits more, and clarify its usage
2018-01-10 11:57:28 -05:00
Remy Oukaour
22b607b664
Move radio channel data into data/
2018-01-10 11:30:12 -05:00
Remy Oukaour
16eb97ae9c
Constant swap explains this Battle Tower bug
2018-01-10 02:55:44 -05:00
Remy Oukaour
8aa58dca9e
Specialized macros go with their data/code
2018-01-10 00:08:05 -05:00
Remy Oukaour
9af6d8d0f1
Split tilesets/ into gfx/tilesets and data/tilesets/
2018-01-09 23:53:58 -05:00
Remy Oukaour
feb34b49ba
data/phone_text → data/phone/text
2018-01-09 19:51:30 -05:00
Remy Oukaour
2f0973f3e0
Clean up some hex values in map scripts
2018-01-09 18:45:25 -05:00
Remy Oukaour
fbc353f206
Replace some hex constants
2018-01-09 18:08:40 -05:00
Remy Oukaour
a8cf8979d9
Do a little cleanup towards issue #465
2018-01-09 17:20:47 -05:00
Remy Oukaour
ce50d1b2cb
Clearer Battle Tower code
2018-01-09 16:55:11 -05:00
Remy Oukaour
a849c3557b
More comments
...
Fix some constants
2018-01-09 15:39:48 -05:00
Remy Oukaour
05e5eaf12f
Eliminate version.asm ( resolves #464 )
2018-01-09 00:51:53 -05:00
Remy Oukaour
bdd3a55333
Organize mobile/battle_tower_*.asm data and code
2018-01-06 18:53:30 -05:00
Remy Oukaour
10bd011d06
More relevant data file locations
2018-01-03 02:23:54 -05:00
Remy Oukaour
8d095cd5b8
Better names
2018-01-03 01:27:12 -05:00
Remy Oukaour
b0d2409c83
Move EZChat Pokémon order to data/
2018-01-02 23:21:07 -05:00
Remy Oukaour
3fc06b0f9d
Use constants
2018-01-02 20:35:57 -05:00
Remy Oukaour
41de67edbd
Identify more G/S intro OAM data
2018-01-02 17:05:40 -05:00
Remy Oukaour
ae78ee6cc8
One more G/S intro OAM identified
2018-01-02 16:19:04 -05:00
Remy Oukaour
6cc4b534b5
Align comments
2018-01-02 16:01:47 -05:00
Remy Oukaour
64b27d86c0
More G/S intro OAM documentation
2018-01-02 15:54:23 -05:00
Remy Oukaour
6a3045d759
1-based EZ Chat cursor data indexes
2018-01-02 15:02:08 -05:00
Remy Oukaour
2dd9ac08a4
More sprite anim documentation
2018-01-02 14:39:24 -05:00
Remy Oukaour
7ad8ea13c9
Document more sprite anim data
2018-01-02 14:25:58 -05: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
xCrystal
e5fa3f9a11
Fix missing palred/palgreen/palblue constants
2018-01-01 21:05:00 +01:00
xCrystal
a98ed77c83
Merge 2d0ed11
and 355acfc
from Roukaour/master
2018-01-01 20:25:07 +01:00
xCrystal
6e12a51503
Use more palette(s) constants
2018-01-01 20:09:53 +01:00
Remy Oukaour
2d0ed1159e
Use constants for rBGPI+rOBPI auto-increment
...
Fix some documentation
2018-01-01 13:43:02 -05:00
yenatch
92fba8821c
Merge pull request #450 from roukaour/master
...
Constants for TextBoxFlags
2017-12-30 21:32:45 -05:00
Remy Oukaour
ab823e2b54
FAST_TEXT_DELAY_F
2017-12-29 13:29:24 -05:00
xCrystal
2a7ba6685a
Clean up changes in 3c6c80f
2017-12-29 19:22:33 +01:00
Remy Oukaour
e1a672e427
Constants for TextBoxFlags
2017-12-29 13:18:17 -05:00
xCrystal
3c6c80f1b2
LY_BLANK and rLCDC constants
2017-12-29 18:53:21 +01:00
xCrystal
69762a2bfd
SET -> set
2017-12-29 17:15:01 +01:00
xCrystal
ee5bf71640
Consistently name unknown fields in macros/wram as Fieldxx
2017-12-29 16:19:51 +01: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
b373984ab9
Rename pokemon animation files ( fix #439 )
2017-12-28 11:05:42 -05:00
xCrystal
7beb497d3a
Uppercase MACRO and EQU(S) according to the style guide
2017-12-28 13:23:44 +01:00
xCrystal
9457679af8
Prefix engine_flags wram addresses with w
2017-12-28 13:15:46 +01:00
Remy Oukaour
e3e64fdf59
Move more decoration data to data/
2017-12-27 11:56:03 -05:00
Remy Oukaour
fbb492f9d7
Note about footprints in comments
2017-12-27 11:33:08 -05:00
Remy Oukaour
e614dd1278
gfx/pokemon/animation.asm → engine/pic_animation.asm
...
Correct comment in constants/pokemon_constants.asm
2017-12-27 01:58:36 -05:00
Remy Oukaour
7a4d641251
Remove redundant data/ filename prefixes
2017-12-27 01:29:15 -05:00
Remy Oukaour
86fd37af16
Move events/ to engine/events/
2017-12-27 00:09:12 -05:00
Remy Oukaour
47e4f21e62
Keep memory map values in hardware_constants.asm
2017-12-26 23:18:05 -05:00
Remy Oukaour
c4a18b1329
Correct documentation
...
Split out text_constants.asm
2017-12-26 22:36:01 -05:00
Remy Oukaour
d15429e3b7
Separate constants in a consistent way
2017-12-26 22:25:11 -05:00
Remy Oukaour
dae16acd6f
event/ → events/, and move some appropriate engine/ files there
2017-12-26 21:55:57 -05:00
Remy Oukaour
b3f0e11567
Various cleanup
2017-12-26 20:33:41 -05:00
Remy Oukaour
35a3a19fda
Use "battle_anims" and "sprite_anims" for clarity, not just "anims"
2017-12-26 18:45:04 -05:00
Remy Oukaour
b5417fafec
Split battle/ into data/ and engine/ components
2017-12-26 17:47:05 -05:00
Remy Oukaour
4d18bb2eda
Rename: gfx/pics → gfx/pokemon
2017-12-26 12:55:02 -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
b5a8e3b3b3
Follow the X_constants/X_data_constants convention
2017-12-25 23:45:54 -05:00
Remy Oukaour
85aa236c34
Use percentages for AI scoring logic
...
Define MAX_DAY_CARE_EXP
2017-12-25 16:18:05 -05:00
Remy Oukaour
e34e68095d
Resolve #428 : Use HIGH(X)
and LOW(X)
instead of X / $100
and X % $100
or X >> 8
and X & $ff
2017-12-25 14:23:16 -05:00
Remy Oukaour
148fd299f9
Add more constants for some maximum values
2017-12-24 19:49:57 -05:00
Remy Oukaour
7d4486e6a3
Remove all code from main.asm (some labeled INCBINs, like out-of-context graphics, are still present)
...
engine/routines/ stores isolated out-of-context routines as individual files. It might be preferable later to append them to their related engine/ files in unique little SECTIONs, relying on the linkerscript to place them appropriately; or some other organization method. In the meantime, they're now easily findable apart from main.asm's other content.
2017-12-24 19:35:35 -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
yenatch
0b8b6f9259
Use PSYCHIC_M for the Psychic TM.
...
Fixes #385
2017-12-24 17:54:24 -05:00
Remy Oukaour
b805d343f3
Merge branch 'master' of https://github.com/pret/pokecrystal
2017-12-24 17:30:29 -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
mid-kid
21607bdd1f
HELD_TRADE_EVOLVE -> HELD_FLINCH
...
This item effect effectively causes the target to flinch (sometimes).
It's not exclusive to trade evolve items in later generations either.
2017-12-24 14:42:05 +01:00
yenatch
c51968f0de
Merge remote-tracking branch 'origin/master' into master
2017-12-23 17:14:09 -05:00
Remy Oukaour
aa97752efe
Move NUM_BUENA_PRIZES to event/buena.asm (still hard-coded)
...
Buena_PrizeMenu has "rept NUM_BUENA_PRIZES", which needs NUM_BUENA_PRIZES to be already defined. BuenaPrizeItems and BuenaPrizeItemsEnd are needed to define NUM_BUENA_PRIZES; but BuenaPrizeItems is defined after Buena_PrizeMenu. I don't see a way to avoid hard-coding its value of 9.
Contrast that with the NUM_MOM_ITEMS constants, which are not used as "rept" arguments and so can be defined within their code file.
2017-12-23 00:31:04 -05:00
Remy Oukaour
daa071451d
More comments for constant<->table correspondences
2017-12-22 23:08:55 -05:00
Remy Oukaour
fbf931f5d3
Ad some more constants for meaningful audio WRAM bits
2017-12-16 00:50:03 -05:00
Remy Oukaour
5aac8afae7
PLAYER_SLIP → PLAYER_SKATE (probably used for the beta skateboard; DoPlayerMovement.BikeCheck returns true for it)
2017-12-15 23:29:42 -05:00
Remy Oukaour
f96aab4014
Correct some documentation comments
2017-12-15 21:32:43 -05:00
Remy Oukaour
e44640b008
Move more main.asm code into individual files
2017-12-15 21:22:26 -05:00
Remy Oukaour
59fe407812
Copy pokered's organization some more, with further constant and data files
2017-12-15 17:22:52 -05:00
Remy Oukaour
dc76bf804f
Move all misc/ and unknown/ files to meaningful directories
2017-12-15 13:21:47 -05:00
Remy Oukaour
ebf3bfb6b2
Move some misc/ files into meaningful directories
2017-12-15 12:53:33 -05:00
Remy Oukaour
253c09949b
Move data/audio/ back into audio/
...
Keep trainer data together
2017-12-15 12:38:59 -05:00
Remy Oukaour
94722aa8f0
Move predef/ files into engine/
...
Get rid of single-file engine/ subdirectories
Move tilesets/ palettes unrelated to individual tilesets into data/palettes/ (more from engine/colors.asm can be moved here too)
2017-12-15 12:31:18 -05:00
Remy Oukaour
d6dc9351e9
Start documenting effect commands
2017-12-15 00:48:59 -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
e48a401290
Reorganize macros
2017-12-14 00:36:24 -05:00
surskitty
d69d81f3a0
Fix the spelling of Thursday
2017-12-13 22:41:15 -05:00
Remy Oukaour
8745915dbd
Rename the Onix trade house to match the rest
2017-12-13 18:07:00 -05:00
Remy Oukaour
0e7a101e41
Use constants for gender ratios
2017-12-13 17:59:14 -05:00
Remy Oukaour
10eb426e40
Document more bugs
2017-12-12 22:58:20 -05:00
Remy Oukaour
c85587d973
Remove unused constant
...
Fix typo
2017-12-12 21:29:53 -05:00
Remy Oukaour
78d489733c
Merge branch 'master' of https://github.com/pret/pokecrystal
2017-12-12 20:15:15 -05:00
Remy Oukaour
93c32e3580
Document bugs and glitches
2017-12-12 20:15:07 -05:00
Remy Oukaour
b006415371
Define constants for collision types
2017-12-12 16:15:58 -05:00
Remy Oukaour
5b13a7a13b
Identify more sprite-related constants
...
Start more documentation
2017-12-12 13:22:19 -05:00
Remy Oukaour
c5675927fe
Identify more sprite-related constants
2017-12-12 12:18:11 -05:00
Remy Oukaour
48e40a7f09
Identify some SPRITE_ANIM_FRAME_IDX_* constants
2017-12-12 02:31:14 -05:00
Remy Oukaour
065de03646
Separate sprite constants and sprite-related data constants, like Pokémon and maps
2017-12-12 01:06:23 -05:00
Remy Oukaour
f1f84743f7
Keep table labels in the same files as their contents.
2017-12-11 22:44:25 -05:00
Remy Oukaour
720cdc72b2
Comments distinguish "move effects" and "effect commands"
...
Effect command enums are used like constants, not macros
2017-12-11 17:41:18 -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
690442e31d
Map dimensions are separate from other constants, same as pokemon_constants vs pokemon_data_constants
2017-12-11 16:51:12 -05:00
Remy Oukaour
5be98bae3c
Move more data tables into data/ files.
2017-12-11 15:20:32 -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
ec380e6df2
tilemap → tileset
2017-12-11 01:11:05 -05:00
Remy Oukaour
41acb0667a
Document macros/map.asm
...
Rename MORN/DAY/NITE to MORN_F/DAY_F/NITE_F; use MORN/DAY/NITE for shifted values (cleaner for person_events)
Prefix FLOOR to the `elevfloor` constants
2017-12-11 01:02:28 -05:00
Remy Oukaour
c6fefd0fe8
Rename overworld sprite files, consistent with their constants
2017-12-11 00:17:39 -05:00
Remy Oukaour
08b14e593e
Rename tilesets, consistent with constant names
2017-12-10 23:56:10 -05:00
Remy Oukaour
b4261d27d8
Use new palette constants
2017-12-10 20:50:08 -05:00
Remy Oukaour
a0bef01a1d
Define more palette constants
2017-12-10 20:10:39 -05:00
Remy Oukaour
699495bfcb
Consistent capitalization for map names, matching their constants
2017-12-10 13:37:15 -05:00
Remy Oukaour
7ccb11c903
Add constants for battle object colors
2017-12-09 22:07:52 -05:00
Remy Oukaour
cd2a748128
More WRAM cleanup
2017-12-09 22:00:36 -05:00
Remy Oukaour
0b7d8d44ad
More constants
2017-12-09 13:28:23 -05:00
Remy Oukaour
55d19b6dca
Separate file for mobile constants
2017-12-09 12:57:42 -05:00
Remy Oukaour
512863989f
Document constants with comments, actual names, and more thorough usage
2017-12-09 02:15:46 -05:00
yenatch
cf7eec3bde
Merge pull request #404 from surskitty/master
...
De-Magic-Numbers the Rocket Grunts
2017-12-06 00:06:11 -05:00
mid-kid
a1fc73603e
Label all of PARTYMENUACTION_*
...
It's pretty clear what it's used for.
PartyMenuActionText is used for two things:
1) Storing what kind of action we're going to do (<$10)
2) Storing the text for some kind of healing stuff I'm not entirely sure (>=$f0)
In the former case, if GetPartyMenuTilemapPointers is ran, it will be
used to pick a sequence of actions that should be done, specified in the
table, and it'll print the corresponding string using the
PartyMenuStrings table. The items in the sequence of actions that should
be done are in WritePartyMenuTilemap.
Strangely enough, one possible value is left completely unused:
PARTYMENUACTION_GIVE_MON_FEMALE. It works in the exact same way as it's
male counterpart, and as such I don't believe it was used in the
japanese version either, since it doesn't matter which gender your 'mon
is when you put 'em in the daycare.
2017-11-30 20:35:58 +01:00
mid-kid
2cc2f057e8
Fix some SPRITE_ANIM_FRAMESET_ constants
...
Thanks to @roukaour for the fixes.
2017-11-29 20:24:19 +01:00
surskitty
b6c1ceed80
Constants for Rocket Grunt rosters.
...
Having constants rather than magic numbers should make it easier
to remove unused grunts from the roster.
2017-11-27 00:35:10 -05:00
mid-kid
df118afbca
Move all of constants/sram_constants.asm into sram
...
This way we can easily use `BANK()` where appropriate, and it is more
tidy.
2017-11-20 23:07:24 +01:00
mid-kid
671341a0fb
Labelled some battle tower-related functions
...
The UbersCheck and LevelCheck are used only for the battle tower,
despite them living in the mobile files.
Also labelled some of the known BattleTowerActions.
2017-11-19 11:52:42 +01:00
mid-kid
1bf12455e4
SelfDestruct -> Selfdestruct
...
Just keeping things consistent. Nobody's going to write SELF_DESTRUCT.
Kind of subjective, and we could do it the other way around, if anybody
really cares.
2017-11-18 17:28:12 +01:00
mid-kid
fd14253796
Clean up labels in battle/moves/move_effects.asm
...
There were a lot of unused labels in there, and a few confusing
misnomers around move_effects_pointers.asm. They now match up exactly
with the names in battle_constants.asm.
Also renamed a few effects, to make their purpose clearer, and to match
up with their respective event script commands:
EFFECT_EXPLOSION -> EFFECT_SELFDESCTRUCT
EFFECT_HAZE -> EFFECT_RESET_STATS
EFFECT_WHIRLWIND -> EFFECT_FORCE_SWITCH
EFFECT_BIND -> EFFECT_TRAP_TARGET
EFFECT_TWINEEDLE -> EFFECT_POISON_MULTI_HIT
EFFECT_STEEL_WING -> EFFECT_DEFENSE_UP_HIT
EFFECT_METAL_CLAW -> EFFECT_ATTACK_UP_HIT
EFFECT_ANCIENTPOWER -> EFFECT_ALL_UP_HIT
2017-11-15 16:36:13 +01:00
pfero
7c9a156133
Fix WATERTILE/WALLTILE constants
...
WATRTILE was wrongly defined as 15, and WALLTILE as 1. Those had to be
flipped around.
This has allowed for us to replace inmediate values with these constants
in several places to improve readability.
WATRTILE was renamed to WATERTILE in the name of readability.
2017-10-28 18:08:24 -04:00
yenatch
866ca63c51
Fix a misleading define for SLP
2017-06-24 17:49:31 -04:00
hatschky
f0209d6ed6
Labels for Trainer Rankings stat tracking functions
2017-01-16 21:11:34 +00:00
PikalaxALT
8f2d68a9e6
Person action and facing labels, part 2
2016-09-27 10:10:13 -04:00
PikalaxALT
ef98c44edd
Person action and facing labels, part 1
2016-09-27 09:37:10 -04:00
PikalaxALT
d84ebd2124
pitchoffset macro to replace forceoctave
2016-07-29 10:40:54 -04:00
pikalaxalt
4e2487c056
hLCDCPointer and InitList
2016-06-13 22:53:33 -04:00
pikalaxalt
ca01a92880
Fix indentation in many places
2016-06-07 08:13:08 -04:00
pikalaxalt
d7a01e92e9
Remaining layout constants
2016-06-06 18:23:00 -04:00
pikalaxalt
bfe2f6d52e
Merge branch 'master' of https://github.com/pret/pokecrystal
2016-05-27 10:39:17 -04:00
Brandon Mulcahy
313e48d6d9
Switch labels for fast and slow exp groups
2016-05-23 16:55:20 -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
1a84ca4e55
EZChat cursor object
2016-05-14 01:11:01 -04:00
pikalaxalt
5ea3a953c3
Name all link trade animation related functions
2016-05-13 22:46:32 -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
ae36ef2c7f
Labeled every function in ROM0 that's referenced in the source
2016-05-10 12:31:49 -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
3713b71d9e
More splitting of main.asm; remove unneeded rept 2
2016-05-04 11:46:23 -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
552febffe8
Merge branch 'master' of https://github.com/pret/pokecrystal
2016-04-10 13:39:55 -04:00
IIMarckus
0a2b14309a
More labels cleanup in map scripts.
2016-04-07 04:13:59 -06:00
pikalaxalt
93e12d2003
Split up banks 1-3 of main.asm
2016-03-27 12:47:28 -04:00
pikalaxalt
707020f9be
Merge branch 'master' of https://github.com/pret/pokecrystal
2016-03-19 19:46:39 -04:00
yenatch
5b27af071c
Add fish group constants.
2016-03-16 18:05:28 -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
d02c9e39dd
BG pal constants, convert tileset pal maps to asm
2016-01-20 19:16:25 -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
2ed6c357af
More WRAM tidying
2016-01-12 12:46:18 -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
0dd5f7ab7a
pokedex palette numbers
2016-01-09 19:56:37 -08:00
YamaArashi
e033ea3a37
commented pokedex more
2016-01-09 17:51:14 -08:00
PikalaxALT
6d1b7f28c8
Split base stats
2016-01-09 16:52:34 -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
2a263629a4
Item effects, post-battle, and decoration flags
2015-12-29 16:44:37 -05:00
PikalaxALT
a2a2668233
Dummy Game
2015-12-28 17:09:53 -05:00
PikalaxALT
57d4cb0edf
trainer card
2015-12-28 10:57:04 -05:00
PikalaxALT
f030315b1f
jumptable macro repurposed
2015-12-26 21:59:03 -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
41618f9e98
More battle anim object constants
2015-12-24 13:33:54 -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
PikalaxALT
3893feb835
Battle Anim Object struct constants
2015-12-23 14:00:29 -05:00