Commit Graph

484 Commits

Author SHA1 Message Date
ISSOtm
e0b783bb7b Enable compatibility with upcoming RGBASM version
This is additionally required, because an `elif`'s condition is evaluated even
when it's about to be skipped over, and this `"\2"` will become an error
2020-08-18 13:41:59 +02:00
Rangi
9d6ac04c9d "<NULL>" -> 0, for 'and a' 2020-08-17 16:29:08 -04:00
Rangi
328a6737db Use ISCONST for future rgbds lexer compatibility 2020-08-17 13:02:49 -04:00
mid-kid
b6055b1944 Use TRUE for hCGBPalUpdate 2020-08-05 16:02:48 +02:00
mid-kid
6f30d79620 TX_NUM -> TX_DECIMAL 2020-08-03 23:35:18 +02:00
mid-kid
79bb2784e9 Better label 2D menu data 2020-08-03 22:56:49 +02:00
Rangi
e239aa4aba Disassemble the final English debug ROM 2020-07-13 15:18:28 -04:00
Rangi
b3bd682366 text_linkpromptbutton -> text_waitbutton
Removes support for text_waitbutton as a legacy alias for text_promptbutton.
2020-07-06 12:55:31 -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
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
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
f2550fc3c2 ReplaceKrisSprite -> UpdatePlayerSprite 2020-06-16 19:38:00 -04:00
Rangi
c552390a15 Harmonize home/ with pokegold 2020-06-16 15:49:32 -04:00
Rangi
b9f2b93c17 Harmonize some more symbols with pokegold 2020-06-16 11:28:52 -04:00
Rangi
f1513ae8ad Add some comments to UpdateBGMap 2020-05-19 20:00:58 -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
b69526a908 Miscellaneous fixes
Addresses the haircut brothers' probability comments in #709
2020-05-05 10:17:02 -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
58b377f25b Fix #709 miscellaneous issues 2020-04-16 09:30:50 -04:00
Rangi
a40ddc4668 Ensure that the cartridge header is patched over all $00s, and comment on the entry point format 2020-04-06 14:44:07 -04:00
Rangi
10909e6b43 hStackBank -> hTempBank 2020-04-06 13:02:23 -04:00
Rangi
1ec60810b8 hBuffer -> hStackBank and hFarByte 2020-04-06 12:52:46 -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
6a6ba10315 rgbds supports 'X - 1' instead of 'X + -1' 2020-03-21 14:01:05 -04:00
Rangi
ad50e94b50 Add a LANDMARK_ prefix to landmark constants
Resolves #697
2020-03-15 19:50:39 -04:00
Rangi
447da80615 Identify remaining gfx/unknown files 2020-02-28 09:23:41 -05:00
Rangi
75a537ed1e Fix some comments and whitespace 2020-02-26 08:41:12 -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
Rangi
2238f52197 Fix build with rgbds 0.3.9 release 2020-02-23 14:28:35 -05:00
mid-kid
813d0aa73a Fix the sections in home/header.asm
They're fixed anyway, and this allows us to make some expressions
constant.
2020-02-23 20:11:54 +01:00
mid-kid
c0b6e5bc21 JoypadInt -> Joypad
This matches all other interrupts. The old Joypad was renamed to
UpdateJoypad.
2020-02-23 14:33:53 +01:00
mid-kid
44128c5d98 Create home/header.asm
Contains what was previously in:
- home/rst.asm
- home/interrupts.asm
- home.asm

All of this should be in a static location in the ROM so it kinda makes
sense together.
2020-02-23 14:28:21 +01:00
mid-kid
7bd8d56ff9 Implement suggestions in PR #687
Merge mon_stats.asm, cry.asm, print_level.asm, and mon_data.asm into pokemon.asm
Merge mon_party.asm into battle.asm
Merge menu.asm, menu_window.asm, and menu2.asm into menu.asm
2020-02-22 12:52:13 +01:00
mid-kid
43eff93861 Small home/ reorganization
Time to move everything out of home.asm:
- InexplicablyEmptyFunction was moved to home/map.asm
- The wDebugFlags functions and xor_a brothers were moved to
  home/flag.asm because they're all flag-related.
- ret_2f3e was moved into home/region.asm
- The register alias sisters were moved to a new file called home/call_regs.asm
- IsInArray and SkipNames were joined by AddNTimes from home/math.asm
  into home/array.asm, as they're all used to index arrays.
- CallPointerAt was moved into home/print_text.asm because given the
  contents of that file it doesn't feel very out of place (that file
  isn't very aptly named...)
- CountSetBits was moved into home/pokedex_flags.asm because it's unique
  use is counting the amount of seen/caught mon in the podedex. GetWeekday
  was pulled into this by proximity.

Other changes were also made:
- PushLYOverrides was moved from home/sprite_anims.asm to
  home/battle.asm, because it's almost exclusively used for battle
  animations, with the lone exception being the Magnet Train.
- home/copy.asm was renamed to home/gfx.asm, as it's all gfx-related
- home/copy2.asm was renamed to home/copy.asm, now it's the only file
  called copy.
- SetHPPal and GetHPPal were moved from home/hp_pals.asm to
  home/tilemap.asm, as they're attrmap related, like many functions in
  that file are.
- home/rtc.asm was renamed to home/time_palettes.asm, as it had very
  little to do with the RTC at all, all RTC functions being in home/time.asm
- home/handshake.asm was renamed to home/printer.asm.
- home/mon_data_2.asm was renamed to home/mon_party.asm.
2020-02-22 00:23:47 +01: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
345b585a78 Document GetTMHMName locals
This was documented in pokegold apparently
2020-02-21 21:10:43 +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
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
fb9cbe7d1e
Merge pull request #650 from pret/audio-macros
Update audio macros and arguments
2020-02-05 18:51:20 -05:00
Rangi
d482dc28f4 Identify four padding bytes in base data as beta front/back pic pointers 2020-02-04 11:07:16 -05:00
Rangi
b1c8548628 Clean up comments in home/time.asm 2020-01-31 20:59:48 -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
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
Rangi
ef48ae98b5 Separate tilesets.o goes with pics.o and sprites.o 2019-11-23 20:43:33 -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
mid-kid
176257ea6f Document WaitPressAorB_BlinkCursor a bit
This is one weird function I'll never understand the purpose of.
It could use a better name, but I have no clue what.
2019-11-18 18:21:57 +01:00
Rangi
4d32035d4f Bit 6 of PrintNum left-aligns numbers 2019-11-03 20:17:04 -05:00
Rangi
69ea875eeb Split menu code out of home/movement.asm 2019-11-03 14:46:36 -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
mid-kid
7111ae8e58 Fix some mobile script and map sign things 2019-10-21 00:42:36 +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
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
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
13cfe356d6 Fix usage of rIE and rSC constants 2019-05-25 17:59:50 +02:00
Rangi
45e3f6aca9 Identify some more WRAM labels 2019-04-19 11:35:27 -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
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
Rangi
df337fc417 Update to rgbds 0.3.8 2019-02-16 12:17:55 -05:00
Rangi
60cdc65293 wc7e8 -> wUnusedC7E8 (similar to wUnusedD102) 2019-01-30 19:46:45 -05:00
Rangi
84b6a084cb Keep "paragraphs" of related code together 2019-01-24 21:10:45 -05: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
mid-kid
930d285fab Fix comments around BANK() statements
Found a couple BANK()s that reference multiple labels.
2018-12-26 21:58:13 +01: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
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
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
f52f20edb7 Rename CheckTrainerBattle
Renamed to be more in line with our current coding standards. Hopefully
this is slightly more readable.
2018-10-11 11:39:09 +02:00
Rangi
3241c9cfaa Use 0/1/2/3 for palettes, and rgbds opt feature for battle transition graphic 2018-09-09 18:15:54 -04:00
Rangi
bb4a6e5f55 wCursorCurTile -> wCursorCurrentTile 2018-09-09 17:15:49 -04:00
Rangi
14a2ea835e Remove redundant comments 2018-09-09 15:15:33 -04:00
Rangi
ae022e1420 Curr -> Cur 2018-09-09 15:09:51 -04:00
Rangi
1c0fff7668 hLabel - $ff00 -> LOW(hLabel) 2018-08-25 14:34:25 -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
Rangi
b5a9e83a94 Fix reviewed issues.
Pokedex_PrintListing has a comment noting how it depends on wCurSpecies == wNamedObjectIndexBuffer; an assert would be more convenient, but is not possible since WRAM label addresses are not defined yet here.
2018-07-29 16:00:11 -04:00
Rangi
c9cb67141b Make reviewed fixes; standardize on " + " 2018-07-29 01:40:23 -04:00
Rangi
9dec80b07e Add meaningful aliases for wd265
Introduce MONICON_* constants
Introduce BATTLEPLAYERACTION_* constants
2018-07-29 00:25:52 -04:00
Rangi
4f0c9cecf9 StringCmp → CompareBytes; CompareLong → CompareBytesLong
hStringCmpString[1/2] → h[EnemyMon/PartyMon1]Speed
2018-07-23 00:25:53 -04:00
mid-kid
ffa63c51df Clean up TX_ commands
Some of the TX_ commands didn't use the TX_ prefix for their
constants, and the label names were inconsistent. I've chosen to adopt
the `TextCommand_` prefix as opposed to `Text_`, as it has a clear
difference in namespace compared to the possibly-used `Text_` namespace
for actual dialogue text.
2018-07-18 10:55:30 +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
b565e6a9dc Miscellaneous reorganization fixes 2018-07-04 02:42:11 -04:00