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
cb5e3378de
Move type data to data/types/
2018-01-22 16:23:34 -05:00
4d8528f903
More engine flag constants
2018-01-22 14:34:55 -05:00
125d51b3b2
More engine bit flag constants
2018-01-22 13:57:44 -05:00
7cef012335
wUnlockedUnowns engine flag constants
...
Use local labels for "End"ings
2018-01-22 13:00:35 -05:00
732bb36c86
Scale addresses with PARTY_LENGTH
2018-01-20 14:10:31 -05:00
05382d3e3c
PARTY_LENGTH; MON_NAME; sgb_border.bin
2018-01-20 12:25:55 -05:00
b071dd364f
Japanese characters in Japanese text (e.g. "ォ" not "," for $f4)
2018-01-19 21:49:16 -05:00
b199f6cfbf
Use hSerialConnectionStatus constants elsewhere
2018-01-19 19:31:45 -05:00
0c6338836d
Resolve #471 (although link code still needs more cleanup, like its WRAM labels)
2018-01-19 14:49:43 -05:00
f556ab9a4c
Comment on RIVAL1 item
2018-01-18 12:03:58 -05:00
7b3de85a06
Avoid "+- 1" at every maskbits
2018-01-16 17:27:50 -05:00
8048082114
Remove Predef_ prefix from routines listed in PredefPointers
2018-01-16 14:39:28 -05:00
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
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
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
eb3102200f
More Battle Tower map script constants, fewer raw hex values
2018-01-14 19:26:55 -05:00
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
2ab60fa8a4
menu_coords macro for (x1, y1, x2, y2) order (see issue #440 )
2018-01-13 16:38:14 -05:00
f1e1b26138
More gfx/**/*.pal files
2018-01-12 14:54:00 -05:00
94d6a32721
Use maskbits some more
2018-01-11 14:27:19 -05:00
0a3b251dcb
Arrays end with -1, not $ff
2018-01-10 22:53:42 -05:00
c8575823a0
Battle data goes in data/battle/
...
TreeMons, like fish groups, have constants
2018-01-10 17:30:27 -05:00
417937cffc
Resolve #461
2018-01-10 13:47:57 -05:00
ee4ec65fc1
map_objects.pal is easier to find in gfx/overworld/ than gfx/sprites/
2018-01-10 02:30:17 -05:00
a8cf8979d9
Do a little cleanup towards issue #465
2018-01-09 17:20:47 -05:00
11556196ba
Consistent sine wave code formatting
2018-01-09 16:39:36 -05:00
a849c3557b
More comments
...
Fix some constants
2018-01-09 15:39:48 -05:00
5a73a62d9b
Move battle engine data into data/
...
IsJohtoGymLeader → IsGymLeader
2018-01-09 15:12:49 -05:00
94f32db7bc
Document hardcoded SRAM addresses.
2018-01-08 22:48:58 -05:00
d6f20ae746
Use BANK for hardcoded SRAM banks (except for vestigial refs to JP's banks 4-7)
2018-01-08 17:13:37 -05:00
2c789b64b1
Predef_FlagAction -> Predef_SmallFarFlagAction
2018-01-07 11:53:20 +01:00
e9e8bf6eb1
Predef_Flag -> Predef_FlagAction
2018-01-05 11:05:01 +01:00
fb422e8d9c
Use BANK for hardcoded WRAM banks preceding FarCopyWRAM/GetFarWRAMByte calls.
2018-01-04 14:53:50 -05:00
9d0ba6bfd3
Use BANK for hardcoded WRAM banks (except where bankswitches appear unnecessary).
2018-01-03 19:12:45 -05:00
0caea0f820
Use BANK for all hardcoded banks with BANK in comments.
2018-01-02 16:46:40 -05:00
aa9a0a900d
No more mobile EQUS ret (replace with Stubbed_ + ret)
2018-01-02 20:00:14 +01:00
b4e087167f
More unreferenced labels and unused text
2018-01-02 19:38:56 +01:00
d7970f749a
Consistent predef function names
2018-01-02 18:49:25 +01:00
be2aeedcf0
More clarification
2018-01-02 11:53:06 -05:00
d435bd8911
Reword Magikarp length comments
2018-01-02 11:50:08 -05:00
6f0b81504d
More unreferenced labels cleanup
2018-01-02 16:04:21 +01:00
7a24703398
Clean up Predef function names
2018-01-02 15:05:14 +01:00
9a3088e50c
Clean up XXX comments for unused content
2018-01-02 13:26:18 +01:00
a98ed77c83
Merge 2d0ed11 and 355acfc from Roukaour/master
2018-01-01 20:25:07 +01:00
37369d1ae0
Rename Pals labels in WRAM bank 5
2018-01-01 20:09:53 +01:00
2d0ed1159e
Use constants for rBGPI+rOBPI auto-increment
...
Fix some documentation
2018-01-01 13:43:02 -05:00
3c6c80f1b2
LY_BLANK and rLCDC constants
2017-12-29 18:53:21 +01:00
50fc9c3389
endm -> ENDM
2017-12-28 22:31:16 +01:00
83ef3b9a36
Suggest fixes to untranslated magikarp length filters
2017-12-28 20:03:27 +01:00
d6507e3882
More constants and documentation in slot machines
2017-12-28 19:38:15 +01:00
731311cb15
Update Magikarp length documentation
2017-12-28 16:42:57 +01:00
333524f0be
Lowercase v for VRAM addresses
2017-12-28 13:32:33 +01:00
7beb497d3a
Uppercase MACRO and EQU(S) according to the style guide
2017-12-28 13:23:44 +01:00
9457679af8
Prefix engine_flags wram addresses with w
2017-12-28 13:15:46 +01:00
7a4d641251
Remove redundant data/ filename prefixes
2017-12-27 01:29:15 -05:00
dae16acd6f
event/ → events/, and move some appropriate engine/ files there
2017-12-26 21:55:57 -05:00
35a3a19fda
Use "battle_anims" and "sprite_anims" for clarity, not just "anims"
2017-12-26 18:45:04 -05:00
b5417fafec
Split battle/ into data/ and engine/ components
2017-12-26 17:47:05 -05:00
mid-kid