Commit Graph

4756 Commits

Author SHA1 Message Date
Rangi
63798d56d0
Merge pull request #699 from Rangi42/master
Resolve some miscellaneous issues
2020-03-23 21:05:39 -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
adbe7f995c Remove some redundant comments superseded by labels (see #693) 2020-03-21 14:14:48 -04:00
Rangi
7558b98a81 Revert the broken CheckTypeMatchup bugfix simplification from 5728d01417 2020-03-21 14:03:38 -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
66b902f900
Merge pull request #696 from Rangi42/master
Rename LANDMARK_* constants, and refactor flypoints
2020-03-15 19:53:14 -04:00
Rangi
ad50e94b50 Add a LANDMARK_ prefix to landmark constants
Resolves #697
2020-03-15 19:50:39 -04:00
Rangi
65f22544e0 Refactor flypoints to separate const definition from data usage 2020-03-15 14:10:53 -04:00
Rangi
c87f8512a4 Add tools/used_space.py to visualize the ROM based on the .map file 2020-03-11 17:10:06 -04:00
Rangi
8eba39dd52 Add tools/used_space.py to visualize the ROM based on the .map file 2020-03-11 15:06:34 -04:00
mid-kid
1d122c86cf
Merge pull request #692 from Rangi42/master
Change how some PNG graphics are formatted
2020-03-01 23:39:53 +01:00
Rangi
f09b68d945 Change how some PNG graphics are formatted 2020-03-01 17:00:57 -05:00
Rangi
9bec0e0f78
Merge pull request #691 from Rangi42/master
Identify remaining gfx/unknown files, and document a Teleport bug
2020-02-28 11:58:18 -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
75a537ed1e Fix some comments and whitespace 2020-02-26 08:41:12 -05:00
Rangi
754268c691
Merge pull request #690 from Rangi42/master
Identify some labels and constants for Battle Tower
2020-02-25 19:44:07 -05:00
Rangi
a73ced3b69 unused_dark_cave -> unused_johto (goes with the beta Johto town+city maps) 2020-02-25 19:18:24 -05:00
Rangi
ee622d6ba1 Identify some labels and constants for Battle Tower 2020-02-25 18:13:50 -05:00
Rangi
4ab60eb2d2
Merge pull request #689 from mid-kid/master
Fix Mac OSX install instructions
2020-02-25 16:27:57 -05:00
mid-kid
e799515931 Fix SRAM references in Function140ae 2020-02-25 19:38:24 +01:00
mid-kid
c5f22b782b Fix Mac OSX install instructions 2020-02-25 19:38:01 +01:00
mid-kid
25794633f1
Merge pull request #688 from Rangi42/master
Edit some comments about bad code
2020-02-24 00:58:44 +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
Rangi
62fccbbd99 Remove empty .gitmodules 2020-02-23 15:15:07 -05:00
Rangi
2238f52197 Fix build with rgbds 0.3.9 release 2020-02-23 14:28:35 -05:00
Rangi
ef1c4c5a81
Merge pull request #687 from mid-kid/master
Small home/ reorganization
2020-02-23 14:16:26 -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
2a8c969bc7 Fix some comments and inmediates 2020-02-21 21:10:55 +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
18013b468a Fix tools/unnamed.py for new rgbds object format 2020-02-21 01:48:17 +01:00
mid-kid
317188b35f Correct fash ship typos 2020-02-16 12:22:13 +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
65a780994f
Merge pull request #684 from Rangi42/master
Define TileCollisionTable as a standard 'db' series
2020-02-13 19:28:14 -05: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
9f2c2627f5 Make tools/sort_symfile.sh case insensitive
Development versions of rgblink now output lowercase
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