Rangi
689acb0e36
Try to identify more of maps/unused/Beta*.blk
2019-04-20 14:45:20 -04:00
Rangi
22cc0c25e9
Merge pull request #625 from pret/aus
...
Build Australian Crystal.
2019-04-14 15:30:51 -04:00
IIMarckus
9f7d30439e
Build Australian Crystal.
2019-04-14 13:22:45 -06:00
Rangi
5cdf4f9ae0
Merge pull request #623 from mid-kid/patch-1
...
Create some battle tower SRAM labels
2019-04-13 11:50:43 -04:00
Rangi
1ada06f576
Merge pull request #622 from mid-kid/master
...
TextBox -> Textbox
2019-04-13 11:50:16 -04:00
mid-kid
c5a4c0bd2e
Create some battle tower SRAM labels
2019-04-12 13:58:49 +02:00
mid-kid
3e78e5b2b6
TextBox -> Textbox
...
Homogenizing names.
2019-04-09 16:09:18 +02:00
Fontbane
a3119736fa
common_1 text documentation
...
Should be almost everything besides some of the mobile stuff and some debug text.
Removed VS stuff
oops
2019-03-16 13:00:44 -04: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
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
4154f191e0
Anotate more of the battle anim subsystem
...
The X and Y flip flags can be applied through the stack consisting of:
- Object attributes
- Animation frame attributes
- OAM Data
Each of these negate eachother.
Confused yet? The same stack is traversed to obtain the final tile ID,
with an added layer on top for the base GFX offset and the offset for
the dynamically loaded GFX requested by the object!
wBattleAnimDelay is populated with the values passed to `anim_wait`.
2019-02-15 03:01:59 +01:00
mid-kid
469c51d086
dorepeat -> dowait for oam animations
...
Having the pic animation macros be the same as the oam animation macros
isn't really turning out so well... I wonder if we should split them up
eventually.
2019-02-15 02:54:35 +01:00
Rangi
1853e3d127
Say "BANK(Foo) ; aka BANK(Bar)" to clarify that Foo and Bar share a bank
2019-01-12 15:17:20 -05:00
Rangi
b975f3e068
Clean up some Odd Egg and Battle Tower code and data
...
Fixes #589
2019-01-02 19:04:50 -05:00
Rangi
afbf1b3ffc
*PhoneScript1 -> *PhoneCalleeScript, and *PhoneScript2 -> *PhoneCallerScript
2018-12-31 16:32:04 -05:00
Rangi
22657f6078
Split generic phone caller+callee text into individual NPCs
2018-12-30 19:20:45 -05:00
Rangi
d3e0eda398
Distinguish "caller" and "called" phone scripts+text (NPCs call you automatically, you call them from the Pokégear)
2018-12-30 18:05:26 -05:00
Rangi
059e0df298
$56 is "<……>"
2018-12-30 17:57:56 -05:00
Rangi
e025ab9db0
Merge pull request #578 from mid-kid/master
...
Fixes in the animation subsystem.
2018-12-09 17:44:09 -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
5dfe652ff6
CalcStats -> CalcBattleStats
...
Confusingly ambiguous name
2018-11-23 23:03:27 +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
32833adef3
Use ANIM_GFX constants for battle animations
2018-11-21 22:35:36 +01:00
mid-kid
4e3ed078f9
Cosmetic fixes
2018-11-20 21:53:45 +01:00
Rangi
3202c4f3df
Resolve issue #575 : Rename text commands
2018-11-18 12:41:11 -05:00
mid-kid
b92b91df17
Adapt tmhm
for consistency
...
Using an underscore before macro variables avoids cluttering up the
global namespace. While this isn't much of a problem right now, it's
good practice that'll keep us from problems in the future.
2018-11-11 00:50:53 +01:00
mid-kid
814a720e9d
Adapt macro based on suggestions
2018-11-11 00:32:05 +01:00
mid-kid
375963349a
Finish new connection macro
...
Tried simplifying things a bit, although not nearly as much as I wanted.
Ideally, we'd either have one of two situations:
- A single set of calculations based on values depending on the
direction of the connection
- A bunch of "generic" calculations done before applying simple
modifiers to them in the final `if` block
Right now it's an icky mix of both and I'm not really sure what to make
of it.
2018-11-10 14:34:49 +01:00
mid-kid
abb9454307
Make the connection
macro simpler to use
...
It now only takes one numerical parameter, which is the offset of the
target map relative to the source map, much like in AdvancedMap. This
makes it easier to make connections and avoids having to calculate these
values by hand, and/or "mess with the values 'till it works", as many
have been doing thus far. It's just one, easy-to-understand value.
To convert from the old macro to the new macro, just take the fourth and
the fifth parameter, and calculate `<4th_param> - <5th_param>`. The
result is the value required for the new macro.
2018-11-06 21:19:07 +01:00
Rangi
0ce8dd75cd
gfx/roofs/*.png filenames match ROOF_* constants
2018-10-31 17:46:18 -04:00
Rangi
cac641a5ed
normal.gbcpal → front.gbcpal
...
Eliminate redundant Makefile rules
Keep Makefile's Pokemon-specific hack rules next to the misc file-specific graphics rules
2018-09-01 20:18:55 -04:00
Rangi
36b21b39d8
Fix #537 : Palettes generated from PNGs use .gbcpal directly.
...
This avoids overwriting a .pal file from a .png with the same name.
It also prevents people from trying to edit generated .pal files.
2018-08-31 21:39:17 -04:00
Rangi
39faa7a9f6
Update file paths in comments
2018-08-19 13:33:35 -04:00
mid-kid
50da83cb23
CheckDestinyBond -> CheckFaint
...
Its main function is fainting the opponent and ending the move effect.
Updated the comment accordingly.
2018-08-17 20:16:37 +02:00
mid-kid
f5cd6341ff
Consistency with order of constant comments
2018-08-07 20:53:14 +02: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
c9cb67141b
Make reviewed fixes; standardize on " + "
2018-07-29 01:40:23 -04:00
Rangi
8935e6f1ca
wDeciramBuffer → wBreedingCompatibility in UnknownText_0x1bd0d8
2018-07-29 00:48:03 -04:00
Rangi
9dec80b07e
Add meaningful aliases for wd265
...
Introduce MONICON_* constants
Introduce BATTLEPLAYERACTION_* constants
2018-07-29 00:25:52 -04:00
Rangi
c2925d6406
db $0, $0 → dn 0, 0, 0, 0 ; DVs
2018-07-24 14:28:04 -04:00
mid-kid
1fc7430a2b
Fix misnamed character codes
...
Some character codes were erroneously named after their text command
counterparts. This has caused a lot of confusion with naming their
functions and with other things.
I've also removed the `dict2` macro and expanded the `dict` macro. This
really isn't something we should be doing for macros but I can't deny it
looks a lot neater than repeated code.
2018-07-18 10:55:30 +02:00
Rangi
b23f0b2bda
Fewer uses of 'Thing2 - Thing1' for sizeof(Thing)
2018-07-16 15:58:07 -04:00
Rangi
d9b44d4423
Consistently use dn for DVs
2018-07-16 15:42:45 -04:00
Rangi
33ad00f1ab
Tile values agree in data/sprites/emotes.asm and data/sprites/facings.asm
2018-07-15 11:26:35 -04:00
Rangi
874bc5ebd5
SFX_UNKNOWN_7F → SFX_TOXIC
2018-07-12 12:25:17 -04:00
Rangi
48e209763f
SFX_DEX_FANFARE_50_79 and SFX_LEVEL_UP use identical data, and technically the level-up text plays the former
2018-07-11 13:24:48 -04:00
Rangi
5e6837807c
landmark macro includes the +8/+16 offsets for X/Y coordinates
2018-07-07 00:59:27 -04:00
Rangi
23450e6b4c
Correct file path
2018-07-05 18:59:56 -04:00
Rangi
255f282a60
Use TRUE/FALSE for wSaveFileExists
2018-07-04 02:50:27 -04:00
Rangi
b565e6a9dc
Miscellaneous reorganization fixes
2018-07-04 02:42:11 -04:00
Rangi
67152eab98
Keep more data/ INCLUDEs with relevant routines
2018-06-25 13:45:50 -04:00
Rangi
5693cc49cf
Single newline at the end of files
2018-06-25 12:07:35 -04:00
Rangi
9f3e9145f9
Remove more triple newlines
2018-06-25 12:01:02 -04:00
Rangi
0f074e2ad1
"→" should be "ェ"
2018-06-24 23:55:18 -04:00
Rangi
67d1364c7a
Fix triple newlines left over from removing address comments
2018-06-24 23:22:50 -04:00
Rangi
9afaed9b8f
Remove more address comments
2018-06-24 21:39:23 -04:00
Rangi
c7032617aa
Remove address comment
2018-06-24 21:28:26 -04:00
Rangi
e2fb7acac0
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# engine/items/mart.asm
2018-06-24 21:23:51 -04:00
mid-kid
5efce10789
Remove even more address comments
...
That should be all of them this time
2018-06-25 02:10:37 +02:00
mid-kid
1d9a68dbdd
Remove all address comments
2018-06-24 16:13:22 +02:00
Rangi
5cbff21a0d
Unreferenced_53d84 → Unreferenced_MonPicBanks from pokegold-spaceworld
2018-06-24 01:13:59 -04:00
Rangi
fbe82a7fe0
Note which labels are only needed for locating banks (relevant to issue #485 )
2018-06-12 23:29:15 -04:00
Rangi
9ac2583b20
Use dn
2018-06-06 18:49:16 -04:00
Rangi
09d1ac8725
Specify DVs individually
2018-06-06 11:45:19 -04:00
yenatch
dbf05e48eb
Merge pull request #517 from mid-kid/master
...
Some fixes all around
2018-06-05 07:04:54 -04:00
yenatch
c61d6a3a5a
Fix other unused shiny check label
2018-06-05 06:58:25 -04:00
mid-kid
e8f847b537
Use structure constants for channel_struct
2018-06-04 11:35:27 +02: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
03570a514e
Correct comment
2018-05-19 13:16:18 -04:00
Rangi
d5fff8aa96
Constants for PC menu indexes
...
'db ' -> 'db '
2018-05-18 22:18:00 -04:00
Rangi
8acc8d6e30
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-05-06 22:45:07 -04:00
Rangi
1c92cb8b48
'rept' is not indented
2018-05-06 12:16:57 -04:00
Rangi
d31ba05aeb
Combine bit flags with | not +
2018-05-05 19:27:10 -04:00
Rangi
de0b344be4
Explicit NO_LIMITS instead of 0
2018-05-05 19:19:51 -04:00
Rangi
5a9975c541
Use explicit HELD_NONE, not 0
2018-05-05 15:36:04 -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
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
yenatch
f750d4f418
Merge pull request #505 from mid-kid/battlecommands
...
Battle command fixes
2018-04-04 21:18:15 -04:00
mid-kid
d4025863cf
Rename some battle commands
...
`hittarget` was misleading, as it doesn't actually "hit" the target, it
only plays the animation. As such, I've renamed it to `moveanim`.
`checkfaint` has nothing to do with checking if the user or target has
fainted, instead, it applies wCurDamage onto the target's HP, hitting
the substitute if applicable. I've renamed the command to `applydamage`
and all of its subfunctions accordingly.
2018-04-04 23:27:40 +02:00
mid-kid
800f948914
Label BattleCommand_BeatUpFailText
2018-04-04 22:40:35 +02:00
mid-kid
682ca7e93c
Label bidefailtext
...
This "unknown" battle command is actually used to give the proper fail
message to bide.
2018-04-04 22:40:21 +02:00
Rangi
aec3802587
Use 'elif' more
2018-04-04 14:06:25 -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
Rangi
0447ee0cf9
Relabel some map-related WRAM
...
wMisc -> {wSurroundingTiles, wBoxPartialData, wLink_c608}
wOverworldMap -> {wOverworldMapBlocks, wHallOfFamePokemonList}
2018-03-19 11:36:14 -04:00
Rangi
e2c15b0b92
* BillPhoneGeneriText -> BillPhoneGenericText
...
* data/phone/text/trainers1.asm -> data/phone/text/trainers.asm
* ,ROM -> , ROM0
2018-02-26 22:29:09 -05:00
Rangi
f0b01a4eea
Document more quirks and bugs
2018-02-26 13:41:48 -05:00
Rangi
9a7da21006
Mention "HAUNTED HOUSE" ( resolves #492 )
2018-02-25 22:25:32 -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
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
yenatch
f44f306cfd
Merge pull request #477 from mid-kid/master
...
Medium-sized cleanups
2018-02-25 20:12:59 -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
Rangi
cbd423ec08
Format map object attributes like trainer attributes, in preparation for bit flag constants
2018-02-25 16:49:03 -05:00
Rangi
eb3726bba0
NO_ITEM == 0
2018-02-25 16:48:31 -05:00
Rangi
e018a9d005
Sprite data values match GetSpriteLength return values and are not limited to multiples of 4
2018-02-25 16:32:40 -05: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
Rangi
612fd7cb96
Merge branch 'master' of https://github.com/pret/pokecrystal
...
# Conflicts:
# maps/KrissHouse2F.asm
2018-02-15 21:21:58 -05:00
mid-kid
89c5f0adf0
Comment GeneratePartyMonStats
2018-02-09 22:21:59 +01:00
Rangi
62d6f72bb3
Make tileset palette maps easier to edit
2018-02-09 13:50:20 -05:00
Rangi
96c058f0a7
No redundant item effect labels
2018-02-05 13:03:05 -05:00
luckytyphlosion
8b007e8d51
Fix more w-izing edge cases.
2018-02-04 22:45:04 -05:00
Rangi
f8f3294130
Add ROOF_ constants
2018-02-04 21:39:46 -05:00
Rangi
885080f213
"chances" → "probabilities", since other files use that term and "changes" exists right next to it
2018-02-04 11:46:53 -05: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
bf138d94d4
scene_def → scene_var (for "variable", like loadvar, copybytetovar, etc)
2018-02-03 16:20:19 -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
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
a9334f7468
Correct engine flag constants
2018-01-31 10:55:35 -05:00
Rangi
50f6007cc2
No need for ==== lines
2018-01-31 10:36:27 -05:00
Rangi
9ac2cea1f7
Align columns
2018-01-31 00:46:03 -05:00
Rangi
96ae7a7ee3
More compact trainer data
2018-01-31 00:37:03 -05:00
Rangi
d260b5f185
Compact trainer data
2018-01-31 00:07:11 -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
6e00101b89
Comment values of special pointers, same as predefs
2018-01-30 14:55:27 -05:00
Rangi
5b678b336c
Simpler map connection macro
2018-01-30 14:32:57 -05:00
Rangi
4c4fca1028
Clean up comments
...
Base data: types uniquely lacked a comment; items on one line; distinguish unknowns
Dex entries: don't imply that pointers don't exist
2018-01-29 11:35:50 -05:00
Rangi
84c798e9f4
Clarify TM/HM move/enum correspondence
2018-01-28 01:20:49 -05:00
Rangi
e22670438e
Badge type boosts make sense in data/types/
2018-01-28 01:17:32 -05:00
Rangi
ea480fa31e
Fix off-by-one error
2018-01-26 20:57:55 -05:00
Rangi
a0cc4a3392
Move power data belongs in data/moves/
2018-01-26 11:01:15 -05:00
Rangi
6ebe45e41f
Move event data to data/events/
2018-01-25 22:19:24 -05:00
Rangi
87514598be
More battle data in data/battle/
2018-01-25 21:34:42 -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
518dd46ca1
data/text/X_text.asm is redundant
2018-01-24 21:27:23 -05:00
Rangi
95fd05744d
Remove "UnusedSpecial_" prefixes too
2018-01-24 11:20:41 -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
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
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
Remy Oukaour
0e1148fb2c
Move code out of data/
2018-01-12 03:15:58 -05:00
Remy Oukaour
bdc95598d7
Easier to find palette data
2018-01-12 03:07:48 -05:00
Remy Oukaour
2b4a4ccaab
SaffronMagnetTrainStation
2018-01-12 02:33:06 -05:00
Remy Oukaour
af4001132e
Break up engine/events_3.asm
2018-01-11 23:50:44 -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
16a39f655a
Full sentences
2018-01-11 02:44:47 -05:00
Remy Oukaour
2d0506ecf9
Group item and deco data more
2018-01-11 01:54:49 -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
3b7c495e38
No romaji
2018-01-10 23:36:49 -05:00
Remy Oukaour
532724e90f
Comment on the original function of move grammar
2018-01-10 23:29:47 -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
e0088adb3f
Other files belong in data/battle/
2018-01-10 17:49:19 -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
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
7de7441e72
gfx/*.asm files have INCBINs
2018-01-10 02:38:45 -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
e943ac3308
Clarify doc comment
2018-01-09 23:26:04 -05:00
Remy Oukaour
5c5f8b325f
Move data/palettes/ .pal files into gfx/
2018-01-09 23:21:32 -05:00
Remy Oukaour
f22485b08d
Binary tilemaps
2018-01-09 22:44:06 -05:00
Remy Oukaour
feb34b49ba
data/phone_text → data/phone/text
2018-01-09 19:51:30 -05:00
Remy Oukaour
cc0fd6e12c
CRYSTAL11 → _CRYSTAL11
2018-01-09 17:26:40 -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
a3242b4ad4
Simpler comments
2018-01-09 15:23:03 -05:00
Remy Oukaour
cb92b7bbf0
Indent with tabs
2018-01-09 15:20:21 -05:00
Remy Oukaour
5a73a62d9b
Move battle engine data into data/
...
IsJohtoGymLeader → IsGymLeader
2018-01-09 15:12:49 -05:00
Remy Oukaour
459d5d3164
default_names.asm → player_names.asm
2018-01-09 00:45:03 -05:00
Remy Oukaour
d0a8e8e744
includes.asm → constants.asm
2018-01-09 00:36:15 -05:00
Remy Oukaour
31edd7f803
Move text/ into data/
2018-01-09 00:23:48 -05:00
Remy Oukaour
187196ff80
Macro clarifies how TimeFishGroups works
2018-01-08 15:54:58 -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
Adelaide Walter
51106cccd0
Scrub WRAM addresses from comments & use WRAM1_Begin where appropriate.
2018-01-03 00:19:54 -05:00
Remy Oukaour
b0d2409c83
Move EZChat Pokémon order to data/
2018-01-02 23:21:07 -05:00
Remy Oukaour
e3e885aad8
pngcrush -noreduce
2018-01-02 19:19:23 -05:00
Remy Oukaour
41de67edbd
Identify more G/S intro OAM data
2018-01-02 17:05:40 -05:00
Remy Oukaour
e6778f931d
town_map.png matches pokegear.png
2018-01-02 16:45:39 -05:00
Remy Oukaour
ae78ee6cc8
One more G/S intro OAM identified
2018-01-02 16:19:04 -05:00
Remy Oukaour
d5c8cb7496
Align comments
2018-01-02 16:09: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