67152eab98
Keep more data/ INCLUDEs with relevant routines
2018-06-25 13:45:50 -04:00
1caa50a647
No space between labels and bodies
2018-06-25 12:24:18 -04:00
5693cc49cf
Single newline at the end of files
2018-06-25 12:07:35 -04:00
9f3e9145f9
Remove more triple newlines
2018-06-25 12:01:02 -04:00
67d1364c7a
Fix triple newlines left over from removing address comments
2018-06-24 23:22:50 -04:00
9afaed9b8f
Remove more address comments
2018-06-24 21:39:23 -04:00
5efce10789
Remove even more address comments
...
That should be all of them this time
2018-06-25 02:10:37 +02:00
1d9a68dbdd
Remove all address comments
2018-06-24 16:13:22 +02:00
fbe82a7fe0
Note which labels are only needed for locating banks (relevant to issue #485 )
2018-06-12 23:29:15 -04:00
5e9c785b3f
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-06-04 11:05:53 +02:00
17087489c6
Miscellaneous fixes in the use of _command constants.
2018-06-01 09:04:36 +02:00
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
ae50b1148a
1 << FRZ == $20
2018-05-19 13:11:50 -04:00
8acc8d6e30
Merge branch 'master' of https://github.com/pret/pokecrystal
2018-05-06 22:45:07 -04:00
1c92cb8b48
'rept' is not indented
2018-05-06 12:16:57 -04:00
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
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
7307fc8dce
Use constants for bit/set/res more
2018-04-05 11:44:02 -04:00
1b12109cb0
HanleDefrost -> HandleDefrost
2018-04-05 11:41:06 +02:00
80d437d565
Fix some uses of EFFECTIVE
2018-04-05 07:54:20 +02:00
f750d4f418
Merge pull request #505 from mid-kid/battlecommands
...
Battle command fixes
2018-04-04 21:18:15 -04:00
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
800f948914
Label BattleCommand_BeatUpFailText
2018-04-04 22:40:35 +02:00
c1e3d17769
`endloop` loops back to critical itself
...
The comments seemed to specify that `endloop` loops back to the command
before `critical` and executes that, which simply isn't true. It loops
back to `critical` itself, and executes `critical`, before continuing on
with the remaining commands.
2018-04-04 22:40:26 +02:00
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
e1da37e033
Comment SapHealth
...
Also fixed some Beat Up inconsistencies to make it more readable.
2018-04-04 22:35:47 +02:00
d3cc861d33
Fix snake_case filenames
...
Renamed a bunch of files, most of them one-off functions, to better fit
the general snake_case naming scheme. Also renamed some awfully long filenames.
2018-04-04 22:26:07 +02:00
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
be76ee56a8
Organize the engine/ directory, director's cut
...
Cleaned up `engine/routines`, in favor of moving files into more
appropriate directories. predef-related routines are now in top-level
`engine`.
`rtc/delete_save_change_clock.asm` has been split into both
`menus/delete_save.asm` and `rtc/reset_password.asm`.
Made a new subdirectory:
* engine/math: Contains all generic math-related routines.
2018-03-25 18:24:14 +02:00
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
be28a0ff4e
Meaningful $ff values
2018-02-25 19:50:48 -05:00
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
ff3a43d4b0
Use maskbits NUM_TYPES
2018-02-20 10:54:48 -05:00
bc3cc69749
Consistent "X percent [+/- Y]" order
2018-02-04 21:21:34 -05:00
d6b00d0cc1
Sync code with wiki
2018-02-04 13:16:40 -05:00
73ea7c6326
Macro factors out sine code, just like sine data, since it's used 5 times
2018-02-03 21:11:55 -05:00
271aa20b73
Keep documentation in sync with new WRAM labels
2018-02-03 20:40:21 -05:00
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
45373ec601
sine_wave macro parameterizes table size, not frequency ("amplitude" was an incorrect comment)
2018-02-02 22:45:42 -05:00
0b45e2e846
Fix wVirtualOAM labels, part 2.
2018-01-30 14:52:46 -05:00
3203ad7d50
Fix comment/style issues caused from w-izing.
2018-01-30 14:05:25 -05:00
e22670438e
Badge type boosts make sense in data/types/
2018-01-28 01:17:32 -05:00
0cf4eb6895
Move-unique effect commands consistently go in engine/battle/move_effects/
2018-01-26 11:36:00 -05:00
a0cc4a3392
Move power data belongs in data/moves/
2018-01-26 11:01:15 -05:00
87514598be
More battle data in data/battle/
2018-01-25 21:34:42 -05:00
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
132fe46925
Rename some routines to avoid conflicts when removing "Special_" prefixes
2018-01-24 11:12:02 -05:00
a1951cefc0
Prefix wram labels with w, part 2.
2018-01-23 17:39:09 -05:00
f2ae74079f
Prefix wram labels with w, part 1.
...
Handle edge cases first.
2018-01-23 16:45:34 -05:00
ead103d2c6
MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue #440 )
2018-01-23 16:08:43 -05:00
Rangi