Commit Graph

1307 Commits

Author SHA1 Message Date
mid-kid
2d2a7dec7d Label some mobile battle screen functions 2020-08-03 23:35:18 +02:00
mid-kid
58b45443e8 Minor title screen fixes 2020-08-03 23:35:18 +02:00
mid-kid
79bb2784e9 Better label 2D menu data 2020-08-03 22:56:49 +02:00
mid-kid
248763b238 Prevent OaksPKMNTalk from looping forever if NUM_GRASSMON is changed
That should cause no real problems because of a range check right after
it.
2020-08-03 22:56:49 +02:00
Rangi
0de7808ded Identify constant in NamingScreen_IsTargetBox 2020-08-03 15:22:28 -04:00
Rangi
35821ec58c Correct constants in DoNPCTrade 2020-07-25 18:36:49 -04:00
Rangi
dcb24bc724 Use def_* macros for automatic map event counts
Resolves #742
2020-07-24 09:57:16 -04:00
Rangi
dd369f3199 Move EngineFlags and SpecialsPointers into data/engine/ 2020-07-22 20:24:53 -04:00
Rangi
11dc805de0 Revert "Factor out tables into data/overworld/"
This reverts commit b5a7e7de3e.
2020-07-22 20:21:26 -04:00
Rangi
b5a7e7de3e Factor out tables into data/overworld/
Fixes #749
2020-07-22 15:22:58 -04:00
Rangi
212846af57 Treat map setup commands like trade script commands
Fixes #736
2020-07-22 13:37:43 -04:00
Rangi
bb25c1074c Use LOAD/ENDL for OAM DMA code in HRAM (requires rgbds 0.4.1) 2020-07-21 19:45:25 -04:00
Rangi
d96f914315 Define JOHTO_FLYPOINT like KANTO_FLYPOINT 2020-07-21 12:15:14 -04:00
Rangi
a9941e28cc Define NUM_FLYPOINTS 2020-07-21 11:48:39 -04:00
Rangi
fc99117d88 " " → $7f 2020-07-21 11:12:56 -04:00
Rangi
de073374a6 Port pokered's more local system for trade animation scripts
Also factor out trade tilemaps
2020-07-17 16:53:22 -04:00
Rangi
59d9932255 SPRITE_GYM_GUY -> SPRITE_GYM_GUIDE 2020-07-17 13:01:48 -04:00
Rangi
ef452ccbc7 return → endcallback, reloadandreturn → reloadend 2020-07-17 08:37:03 -04:00
Rangi
eca33ef190 Define map setup commands as macros like other script commands 2020-07-13 20:44:16 -04:00
Rangi
e239aa4aba Disassemble the final English debug ROM 2020-07-13 15:18:28 -04:00
Rangi
c086de0c98 Use const_skip and const_next macros for brevity 2020-07-10 20:03:46 -04:00
Rangi
6ca82e5c86 Eliminate enum: use const instead, with case-by-case parallel const implementations 2020-07-08 15:30:23 -04:00
Rangi
43a9295789 add_tm, add_hm, and add_mt define TM##_MOVE, HM##_MOVE, and MT##_MOVE constants, to avoid repeating the move names in tmhm_moves.asm 2020-07-06 16:53:05 -04:00
Rangi
ddf1163a21 Define SERIAL_PREAMBLE_LENGTH 2020-07-06 15:49:01 -04:00
Rangi
7eef66af3f Use MAX_NEUTRAL_DAMAGE in BattleCommand_DamageCalc
Also make .gitignore consistent with pokered
2020-07-05 15:12:53 -04:00
Rangi
f5ac9b0eb7 SCGB_PARTY_MENU_HP_PALS -> SCGB_PARTY_MENU_HP_BARS, and SCGB_RAM -> SCGB_DEFAULT 2020-07-04 16:18:16 -04:00
Rangi
fce6243b43 Identify more labels, and use the jumptable macro when possible 2020-07-01 13:13:49 -04:00
Rangi
e171c84c29 Identify more labels and constants 2020-06-29 19:35:47 -04:00
Rangi
f2efda1f68 Identify more unnamed labels 2020-06-29 12:25:58 -04:00
Rangi
022f9e6af1 Reformat gfx/trade/game_boy.png and fix tools/gfx --preserve 2020-06-28 19:56:06 -04:00
Rangi
61847b3596 Identify some more labels 2020-06-22 16:30:13 -04:00
Rangi
e0d07fba3f Sync PokeFluteTerminator with pokegold 2020-06-21 19:01:54 -04:00
Rangi
c3c18dd196 Comment more ROM labels as unreferenced
(Some unreferenced labels are above code which is still used via fallthrough!)
2020-06-21 18:33:31 -04:00
Rangi
91774f206e Replace "Unreferenced" labels with "; unreferenced" comments 2020-06-21 16:27:43 -04:00
Rangi
98af69691d Remove some more raw addresses 2020-06-21 12:21:47 -04:00
Rangi
9433b5a752 Remove RAM address comments 2020-06-20 23:03:40 -04:00
Rangi
273324e787 pushd/popd are bash-only 2020-06-20 22:44:01 -04:00
Rangi
ed3bcf6fa2 Harmonize engine/menus with pokegold 2020-06-18 10:11:12 -04:00
Rangi
50e182e831 Harmonize engine/overworld with pokegold 2020-06-17 22:12:04 -04:00
Rangi
cc460a17b0 Harmonize engine/{movie, pokemon} with pokegold (renames GetSRAMBank to OpenSRAM)
To do: engine/{menus, overworld}
2020-06-17 17:03:38 -04:00
Rangi
be93ab33a7 Harmonize engine/{phone, pokedex, pokegear, printer, rtc, tilesets} with pokegold
To do: engine/{menus, movie, overworld, pokemon}
2020-06-17 11:29:00 -04:00
Rangi
8019db3ea9 Harmonize engine/{gfx, items, link, math} with pokegold 2020-06-17 10:39:17 -04:00
Rangi
f2550fc3c2 ReplaceKrisSprite -> UpdatePlayerSprite 2020-06-16 19:38:00 -04:00
Rangi
f76dabedcc Harmonize engine/{battle, battle_anims, events, games} with pokegold 2020-06-16 19:32:36 -04:00
Rangi
7b2515d1e4 [in progress] Harmonize more constant and data files with pokegold 2020-06-16 14:32:57 -04:00
Rangi
2354c41a96 crystal_intro.asm -> intro.asm 2020-06-16 11:44:03 -04:00
Rangi
b9f2b93c17 Harmonize some more symbols with pokegold 2020-06-16 11:28:52 -04:00
Rangi
4342ced31f Identify wObjectPriorities 2020-06-15 23:28:24 -04:00
Rangi
e3f07b9612 Undo incorrect comment 2020-06-15 10:26:10 -04:00
Rangi
ffbca4d5f3 Adding 0 is pointless in CheckMimicUsed 2020-06-15 08:43:40 -04:00
Rangi
401aa383e2 make DEBUG=1 logs all symbols in the .map and .sym files 2020-06-14 21:52:33 -04:00
Rangi
75035a71a5 Label some mobile addresses, and revise some comments 2020-06-13 18:48:26 -04:00
Rangi
0d683ea0c7 Remove redundant tile graphics file, reuse others 2020-06-11 10:55:32 -04:00
Rangi
60c71add58 Define pokeanim setup commands like std scripts, predefs, and specials
No need for a macro workaround in rgbds 0.4.0
2020-06-10 17:15:53 -04:00
Rangi
9ab2575727 predef_id -> lda_predef, for consistency with lda_coord and map_id 2020-06-10 17:08:43 -04:00
Rangi
cdafd41ef0 Remove address-related comment 2020-06-10 16:45:04 -04:00
Rangi
518cee440e Resolve #723: treat std scripts like specials and predefs 2020-06-10 16:44:16 -04:00
Rangi
4259b0f934 Separate UnusedBattleObjectPals from PartyMenuOBPals 2020-06-03 12:20:34 -04:00
Lhivorde
4f49a1f2f0
Rename ScrollingMenu_UpdateDisplay.string_2485f (#726) 2020-05-29 11:16:49 +00:00
Rangi
fe42ef8a88 Some uses of SCREEN_WIDTH and SCREEN_HEIGHT 2020-05-25 21:05:52 -04:00
Rangi
60f7ca4006 Group MoveDescriptions with PrintMoveDesc and rename that to PrintMoveDescription (like ItemDescriptions with PrintItemDescription) 2020-05-25 03:54:42 -04:00
Rangi
156f2cc3ef Update some routine labels, including unreferenced ones 2020-05-18 11:59:48 -04:00
Rangi
e32cf1bfd1 Miscellaneous cleanup noted in #709 2020-05-17 20:59:15 -04:00
Rangi
395ebd8386 Format all CopyTilemapAtOnce variations the same way 2020-05-16 22:25:52 -04:00
Rangi
abf3858fc4 Update some comments 2020-05-10 01:20:06 -04:00
Rangi
5f197c53f4 Clean up some percentage values 2020-05-07 14:21:24 -04:00
Rangi
905833ef8c Use a FIRST_UNOWN_CHAR constant for the Unown font 2020-05-06 10:34:51 -04:00
Rangi
20464d1bfb Miscellaneous updates
- `PREDEFPAL_00` -> `PREDEFPAL_ROUTES` (observed from `LoadSGBLayout.GetMapPalsIndex.route`)
- `$0` -> `PLAYER` (standard person ID)
- Fix some whitespace formatting
2020-04-30 11:27:32 -04:00
Rangi
b50dd57cbb Miscellaneous updates and corrections 2020-04-23 16:14:50 -04:00
Rangi
576cbf5b3e Miscellaneous fixes, including one for the Pokédex design flaw by ax6 2020-04-18 17:31:51 -04:00
Rangi
22615cecc5 More miscellaneous fixes (see #709) 2020-04-17 10:52:59 -04:00
Rangi
58b377f25b Fix #709 miscellaneous issues 2020-04-16 09:30:50 -04:00
Rangi
865d623846 Remove unused nonmatching files for electro_ball.png and sgb_border.bin
electro_ball.png needed to preserve one whitespace tile which tools/gfx would normally remove. Preserving a list of tile indexes has been added as a general feature to tools/gfx.

sgb_border.bin needed to remove the 20x18 center area of $00 bytes. This is achievable with the standard tr utility.
2020-04-08 12:14:37 -04:00
Rangi
3144b54bd1 Enable rgbds warnings and remove CFLAGS=-O2 (default is now -O3) 2020-04-06 12:41:07 -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
79184bc718 Miscellaneous fixes:
- `hSecondsBackup` -> `hUnusedBackup`
- `ld bc, hBGMapAddress + 1` -> `bccoord -1, -2, 0`
- Identify some `.asm_XXX` labels
2020-04-04 15:43:10 -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
Rangi
0345e4fb0e Add suffixes to some constants to avoid ambiguity
- `PSYCHIC` → `PSYCHIC_TYPE` (not the trainer `PSYCHIC_T` or the move `PSYCHIC_M`)
- `BLACKBELT` → `BLACKBELT_I` (not the trainer `BLACKBELT_T`)
- `CURSE_T` → `CURSE_TYPE` (not the move `CURSE`)
- `TOWN_MAP_D` → `TOWN_MAP_POSTER` (not the item `TOWN_MAP`)

This also uncovered a misidentified event: `EVENT_DECO_PLANT_4` → `EVENT_DECO_POSTER_1`. (There are three plants and four posters.)
2020-03-21 17:59:26 -04:00
Rangi
6a6ba10315 rgbds supports 'X - 1' instead of 'X + -1' 2020-03-21 14:01:05 -04:00
Rangi
5a5f5ececd Miscellaneous fixes from #694 2020-03-21 13:07:18 -04:00
Rangi
624864307e Combine Celebi frames into one PNG 2020-03-16 08:58:28 -04:00
Rangi
ad50e94b50 Add a LANDMARK_ prefix to landmark constants
Resolves #697
2020-03-15 19:50:39 -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
0cce00cb73 Document a bug where Teleport cannot fail for wild Pokémon 2020-02-28 11:17:58 -05:00
Rangi
447da80615 Identify remaining gfx/unknown files 2020-02-28 09:23:41 -05:00
Rangi
81eaf83cd7 Identify gfx/unknown/4985a.asm as gfx/tilesets/forest-tree/unused.png 2020-02-26 15:41:22 -05:00
Rangi
ee622d6ba1 Identify some labels and constants for Battle Tower 2020-02-25 18:13:50 -05:00
mid-kid
e799515931 Fix SRAM references in Function140ae 2020-02-25 19:38:24 +01: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
9a927c1b3e
Merge pull request #685 from mid-kid/master
Moshi moshi? minoru enhansumentsu desu
2020-02-21 21:11:36 +01:00
mid-kid
2a8c969bc7 Fix some comments and inmediates 2020-02-21 21:10:55 +01:00
mid-kid
c22e268083 RTC -> UpdateTimeAndPals
Rename clear misnomer.
Most of the related functions in that file aren't really aptly named but
I don't know good names right now.
2020-02-21 18:21:29 +01:00
mid-kid
75a6bb5df6 PanicResetClock -> ClearClock
Funky name that only exists based on what it's used for, not so much
what it is.
2020-02-16 12:20:20 +01:00
Rangi
88bbdb6a2f Define TileCollisionTable as a standard 'db' series 2020-02-13 19:07:19 -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
a241f049df Remove FarCall prefix from SwapTextboxPalettes and ScrollBGMapPalettes
No prefix for the farcall, prefix with an underscore for the farcalled.
This matches what is done for pretty much every other home function.
2020-02-13 18:31:10 +01:00
mid-kid
991d207d86 OWFlash -> FlashFunction
Match the other overworld move functions
2020-02-13 18:31:10 +01:00
mid-kid
a094c58f1e Split up engine/events/misc_scripts_2.asm
New files are:
- engine/events/hidden_item.asm
- engine/events/repel.asm
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
ceadab8cd1 PnP_HiddenPlaces -> PnP_Places
The "Places & People" radio station does not avoid these maps; it only describes these maps.
2020-02-06 11:07:42 -05:00
Rangi
fb9cbe7d1e
Merge pull request #650 from pret/audio-macros
Update audio macros and arguments
2020-02-05 18:51:20 -05:00
Rangi
24a23b1922 Use CMDQUEUE constants 2020-02-04 11:11:43 -05:00
mid-kid
44b361c1bb Merge branch 'master' into audio-macros 2020-02-04 16:03:01 +01:00
Rangi
80cf859cd3 PHONE_DISPLAY_HEIGHT is 4, the number of visible phone entries 2020-01-19 14:10:10 -05:00
dannye
e7be25948d Merge branch 'master' into audio-macros 2020-01-06 22:07:33 -06: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
Colton G. Rushton
5728d01417 Add and simplify bugfixes in bugs_and_glitches.md (#664)
Add extra fixes for bugs covered on Bulbapedia (and simplify others)
2020-01-04 16:52:08 -05:00
Rangi
fa7261a8ee Update some labels 2019-12-03 09:17:21 -05:00
Rangi
0e311ad709 Fix miscellaneous points made in #658 2019-11-23 20:56:22 -05:00
mid-kid
739a60b33c Make the map setup commands match the actual function names better
These functions used as map setup commands are used in other places,
too, so I can't prefix them under the same. The names should match
except I won't repeat "map" in a map setup command name.
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
d076159745 Don't use colons for local labels in LoadSpecialMapPalette 2019-11-04 17:43:37 -05:00
Rangi
51720e1e3c Fix #645: Use English labels for European mail handling functions 2019-11-03 20:34:02 -05:00
Rangi
4d32035d4f Bit 6 of PrintNum left-aligns numbers 2019-11-03 20:17:04 -05:00
Rangi
0c7b309f7f Suggested formatting changes 2019-11-03 20:07:25 -05:00
Rangi
fbe2494dc2 Miscellaneous label and comment corrections 2019-11-03 14:47:06 -05:00
Rangi
717cf3f458 Identify PLAYERMOVEMENT_* constants 2019-11-03 14:30:33 -05:00
Rangi
d5e1b5a628 The $C9 byte in page2.tilemap is a ret opcode 2019-11-03 14:18:23 -05:00
Rangi
4211886921 Use constants for quantities when copying SGB border tiles and palettes 2019-11-03 14:15:20 -05:00
Rangi
f511713c86 Identify some move screen functions 2019-11-03 13:46:00 -05:00
Rangi
3e7c7d5fff Identify intro tilemaps and attrmaps 2019-11-03 13:38:40 -05:00
Rangi
4aeab6b879 Rename buttonsound to promptbutton 2019-11-03 12:48:54 -05:00
Rangi
5134266b9a Rename OBJECT_LENGTH to MAPOBJECT_LENGTH and OBJECT_STRUCT_LENGTH to OBJECT_LENGTH 2019-11-03 12:26:38 -05:00
Rangi
01f68fcc6a Rename TILESET_BATTLE_TOWER to TILESET_BATTLE_TOWER_INSIDE 2019-11-03 12:03:37 -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
1f172badc4 Misc fixes 2019-10-21 00:31:50 +02:00
bbbbbbbbba
0d48d829d4 Document Special Defense badge boost glitch (#651)
Document Special Defense badge boost glitch
2019-10-20 18:25:34 -04: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
Ryan Tandy
3fc2ba41f7 Clarify naming of SFX_GET_EGG_* pointers
In game, one receives eggs from the Aide and the Day-care Man, not the
Day-care Lady. SFX `0x96` is used for both. Rename it to reflect it is
not unique to the Day-care.

SFX `0x95` is an alias of the same sound and appears to be unused.
Rename the pointer to clarify that.
2019-09-23 10:03:19 -07:00
dannye
fc051f2130 Update audio macros and arguments
and update related labels/constants/comments
this fixes a lot of mistakes and maximizes compatibility with red
2019-09-02 03:41:25 -05:00
Rangi
6962d843a3 Store Magnet Train tilemaps in their own files 2019-08-11 18:48:26 -04:00
Rangi
01618d3cc4 Define constants for both battle transition tiles 2019-06-30 14:20:25 -04:00
mid-kid
ad299b1635 Apply suggested changes 2019-06-10 01:52:46 +02:00
mid-kid
d6db010429 Document high nybble of PrintNum c register 2019-06-09 17:46:06 +02: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
c7fdf5f9ec Fix overworld scrolling function names 2019-06-09 00:17:35 +02:00
mid-kid
b6277408a0 Misc fixes 2019-06-04 13:31:22 +02:00
mid-kid
309079524b Fix menu_coords for pokecenter pc 2019-06-04 13:11:29 +02:00
mid-kid
649c8d38da Get rid of _CRYSTAL
Having this here is completely redundant and useless, and doesn't even
work since it should use `if DEF(_CRYSTAL)` instead.
2019-05-25 17:59:50 +02:00
mid-kid
13cfe356d6 Fix usage of rIE and rSC constants 2019-05-25 17:59:50 +02:00
mid-kid
40766b9a76 Magnet train fixes
Should make the code slightly easier to read, at least
2019-05-25 17:59:50 +02:00
Rangi
b24cd55f96 Correct the older+younger haircut brothers' labels and constants 2019-05-18 13:27:32 -04:00
Rangi
7890fae995 Some more GB Printer documentation 2019-05-11 13:01:59 -04:00
Rangi
cca2afe827 More fixes for fixes 2019-04-23 19:07:41 -04:00
Rangi
71db95dc34 Identify a few more WRAM label uses 2019-04-19 18:55:04 -04:00
Rangi
45e3f6aca9 Identify some more WRAM labels 2019-04-19 11:35:27 -04:00