Commit Graph

228 Commits

Author SHA1 Message Date
Rangi
b69526a908 Miscellaneous fixes
Addresses the haircut brothers' probability comments in #709
2020-05-05 10:17:02 -04:00
Rangi
22615cecc5 More miscellaneous fixes (see #709) 2020-04-17 10:52:59 -04:00
Rangi
0ef004a4db dsprite y, ypx, x, xpx, off, attr -> dbsprite x, y, xpx, ypx, off, attr 2020-04-04 16:00:30 -04:00
Rangi
0ee9d7a48b Upgrade to rgbds 0.4.0
- fail for rgbds < 0.4.0
- `rst <Label>`
- `ds <count>, <byte>`
- `shift <N>`
- ASCII "\r"
- Sorted .sym file
2020-04-04 15:15:02 -04:00
Andrew Cook
5d97f15f80
Assorted labels in mobile related code (#702)
Rename assorted labels in mobile-related code
2020-03-31 21:26:59 -04:00
Rangi
6a6ba10315 rgbds supports 'X - 1' instead of 'X + -1' 2020-03-21 14:01:05 -04:00
Rangi
f09b68d945 Change how some PNG graphics are formatted 2020-03-01 17:00:57 -05:00
Rangi
1d4c1aeef4 'and BANK' -> 'aka BANK' 2020-02-28 11:51:42 -05:00
Rangi
447da80615 Identify remaining gfx/unknown files 2020-02-28 09:23:41 -05:00
Rangi
c3f389d615 Replace some "idiotic", "wtf", "stupid interns" comments with more common "useless", "pointless", "could have done X instead" 2020-02-23 18:51:32 -05:00
mid-kid
26b8bf003e Standardize on lowercase Tilemap and Attrmap
We used to have a mixture of TileMap and and Tilemap, as well as the
similar AttrMap. Standardize on one.
2020-02-13 18:31:10 +01:00
mid-kid
34ceaac71d Call_LoadTempTileMapToTileMap → SafeLoadTempTileMapToTileMap
Stupid name is stupid smh tbh fam.
2020-02-13 18:31:10 +01:00
mid-kid
0d81f1c470 InitSpriteAnimStruct <-> _InitSpriteAnimStruct
These were the wrong way around, as the function in home should not be
prefixed
2020-02-13 18:31:10 +01:00
Rangi
94ebdab6d3
Merge pull request #660 from mid-kid/master
Make the map setup commands match the actual function names better
2020-01-04 20:08:43 -05:00
Rangi
0e311ad709 Fix miscellaneous points made in #658 2019-11-23 20:56:22 -05:00
Rangi
008f591a3a Keep mobile SECTION declarations in main.asm, and name them "mobileXX" like "bankXX" 2019-11-23 20:32:20 -05:00
mid-kid
563ba14196 Remove old charmap sections 2019-11-19 01:01:47 +01:00
Colton G. Rushton
7b2377c41e Fixed a charmap warning with the new RGBDS 2019-11-18 18:27:48 +01:00
mid-kid
1c41b2e579 Fix some mobile-related things 2019-11-18 18:21:57 +01:00
mid-kid
77803f571f Fix some constants around wLinkMode 2019-11-18 18:21:57 +01:00
Rangi
e669f22e9e GFX_17eb7e -> PokemonNewsTileAttrmap 2019-11-03 13:55:29 -05:00
Rangi
4aeab6b879 Rename buttonsound to promptbutton 2019-11-03 12:48:54 -05:00
mid-kid
86061d37d2 More mobile SDK documentation
Labelled WRAM addresses, added constants for mobile commands, fixed some
mobile lib function names, documented most of the functions for specific
commands.
2019-10-21 00:42:36 +02:00
mid-kid
f4907040c9 Label some more WRAM/SRAM things
This should be all of the memory locations that are actually used, and
some more.
Removal of all addresses when?
2019-10-21 00:42:36 +02:00
mid-kid
7111ae8e58 Fix some mobile script and map sign things 2019-10-21 00:42:36 +02:00
mid-kid
29deef86f8 Document the location of the mobile adapter colors 2019-10-21 00:42:36 +02:00
mid-kid
3664cee79b Add s5_a800 labels 2019-10-21 00:42:36 +02:00
mid-kid
7d0de22e7e Document mobile SDK error packets 2019-10-21 00:42:36 +02:00
mid-kid
b7770e5f88 Add more error message translations
Thanks to melonjaywalk#5480
2019-10-21 00:42:36 +02:00
mid-kid
e68da6e717 Document some mobile-related things, discovered thanks to Dan Docs and the efforts of the Gameboy Online Restoration Project 2019-10-21 00:42:32 +02:00
mid-kid
e3e0bcd653 #641 fixes and additions. (#646)
Name a lot of text labels according to our conventions
2019-10-20 18:24:17 -04:00
Rangi
3e056a6862 Store a mobile tilemap+tilemap in its own files 2019-08-11 22:20:26 -04:00
mid-kid
c048b24d25 Create constants for ScrollingMenu item formats
...I should've done this quite a while ago.
2019-06-09 02:31:24 +02:00
mid-kid
6b37353406 Properly disassemble MenuData_0x4851b 2019-06-09 00:24:40 +02:00
mid-kid
b6277408a0 Misc fixes 2019-06-04 13:31:22 +02:00
mid-kid
13cfe356d6 Fix usage of rIE and rSC constants 2019-05-25 17:59:50 +02:00
Rangi
22cc0c25e9
Merge pull request #625 from pret/aus
Build Australian Crystal.
2019-04-14 15:30:51 -04:00
IIMarckus
0914cc01b5 Rename Stadium 2 blobs based on ROM version. 2019-04-14 13:23:17 -06:00
IIMarckus
9f7d30439e Build Australian Crystal. 2019-04-14 13:22:45 -06:00
Rangi
1ada06f576
Merge pull request #622 from mid-kid/master
TextBox -> Textbox
2019-04-13 11:50:16 -04:00
Rangi
9c0ef59cb0
Merge pull request #614 from Fontbane/text
common_1 text documentation
2019-04-13 11:46:37 -04:00
mid-kid
3e78e5b2b6 TextBox -> Textbox
Homogenizing names.
2019-04-09 16:09:18 +02:00
Rangi
2184b60a0c Identify and eliminate wEngineBuffer1-5 2019-04-08 19:42:55 -04:00
Fredrik Ljungdahl
e598e49edb Fix wram labeling for wPCItems 2019-03-18 16:43:58 +01: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
ae31902074 hFFEC is not an HRAM location 2019-03-03 15:07:00 -05:00
Rangi
7c42452748 Standardize on $ff ^ X for bitwise negating 8-bit values 2019-02-16 13:52:19 -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
3202c4f3df Resolve issue #575: Rename text commands 2018-11-18 12:41:11 -05:00
mid-kid
940256569b text_jump → text_far
The previous name for this was rather misleading. It isn't an actual
jump like you'd expect the `jp` instruction to behave as. Instead, it
behaves more like a `farcall`.
This also makes it consistent with its current command ID name of
`TX_FAR`.
2018-11-05 22:26:18 +01:00
mid-kid
6a2cad6bcc Add colons to some function labels 2018-11-05 22:26:18 +01:00
Rangi
3b20a18200 Identify BATTLEACTION_D and _E (thanks, ax6) 2018-10-21 00:52:10 -04:00
Rangi
38bf21ae35 Naming screen constants 2018-09-22 12:39:17 -04:00
Rangi
ae022e1420 Curr -> Cur 2018-09-09 15:09:51 -04:00
Rangi
557ce82073 hQuotient is a four-byte buffer (fixes #558) 2018-08-26 13:49:38 -04:00
Rangi
b2adcd6d6f Reorganize math-related HRAM union (ffb3) 2018-08-25 21:49:26 -04:00
Rangi
7aa1c1f388 Remove HRAM label address comments 2018-08-25 14:39:24 -04:00
Rangi
eb1e3636bb Use labels instead of constants for HRAM
Use explicit ldh instruction to access HRAM locations, don't rely on optimizing ld
2018-08-25 14:28:22 -04: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
8aa08addba wLuckyNumberDigitsBuffer 2018-07-29 01:13:25 -04:00
Rangi
9dec80b07e Add meaningful aliases for wd265
Introduce MONICON_* constants
Introduce BATTLEPLAYERACTION_* constants
2018-07-29 00:25:52 -04:00
Rangi
a1806d6e81 Consistent routine naming convention: 'Foo' wraps '_Foo' 2018-07-23 00:13:43 -04:00
mid-kid
db8830ba53 Label more mobile WRAM
Memes and a pipedream of a fully-documented wram.
2018-07-18 10:56:26 +02: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
dba7f59d83 More OAM coordinate consistency 2018-07-15 11:58:01 -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
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
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
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
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
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
Rangi
7307fc8dce Use constants for bit/set/res more 2018-04-05 11:44:02 -04:00
Rangi
81306889e3 Merge branch 'master' of https://github.com/pret/pokecrystal 2018-04-04 23:56:40 -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
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
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
a22343d32c Fix TRUE/FALSE constants for CalcMonStats 2018-02-22 18:12:43 +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
Rangi
612fd7cb96 Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
#	maps/KrissHouse2F.asm
2018-02-15 21:21:58 -05:00
luckytyphlosion
8b007e8d51 Fix more w-izing edge cases. 2018-02-04 22:45:04 -05:00
Rangi
d6b00d0cc1 Sync code with wiki 2018-02-04 13:16:40 -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
e32e5212af use "x + -1" not "x +- 1"
(TODO: use "x - 1" once rgbds allows it)
2018-02-02 22:55:38 -05:00
luckytyphlosion
0b45e2e846 Fix wVirtualOAM labels, part 2. 2018-01-30 14:52:46 -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
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
c5cc23a35f wGameTimerPause bit flag constants 2018-01-23 12:40:29 -05:00
Rangi
a73c532738 tile+color macros in gfx.asm 2018-01-22 19:40:17 -05:00