Commit Graph

3990 Commits

Author SHA1 Message Date
Marcus Huderle
b97287be29
Merge pull request #397 from mid-kid/master
A few more labels and comments
2017-11-21 17:15:25 -08:00
mid-kid
e5f9fddb86 PewterPokeCEnter2FBeta -> PewterPokeCenter2FBeta
Probably a typo.
2017-11-22 00:34:37 +01:00
mid-kid
359d73ceef Move LoadOverworldFont to main.asm
It doesn't fit correctly in misc/mobile_41.asm.
Also moved the font images out of gfx/unknown and into gfx/font.
2017-11-21 23:53:51 +01:00
mid-kid
df118afbca Move all of constants/sram_constants.asm into sram
This way we can easily use `BANK()` where appropriate, and it is more
tidy.
2017-11-20 23:07:24 +01:00
mid-kid
617ba8be3d width -> weight
This used to be confusing, since the first thing I think when I see
"width, height" is graphics, in this case probably the sprites.
Well, it has nothing to do with that. Weight is mass times gravity or
something, width is a form of distance.
2017-11-20 18:11:53 +01:00
mid-kid
35a8e9da5d DetermineMobileBattleResult -> DisplayLinkBattleResult
Changed this function's name, because it confusingly only calls
DetermineLinkBattleResult when linked through mobile.
It does absolutely nothing with determining the battle result in a
regular link battle, and is only responsible for displaying the battle
result and counting stats.
2017-11-19 11:54:34 +01:00
mid-kid
671341a0fb Labelled some battle tower-related functions
The UbersCheck and LevelCheck are used only for the battle tower,
despite them living in the mobile files.
Also labelled some of the known BattleTowerActions.
2017-11-19 11:52:42 +01:00
mid-kid
1bf12455e4 SelfDestruct -> Selfdestruct
Just keeping things consistent. Nobody's going to write SELF_DESTRUCT.
Kind of subjective, and we could do it the other way around, if anybody
really cares.
2017-11-18 17:28:12 +01:00
mid-kid
23445ba4be Define bank43 in main.asm instead of unused_title
All other banks are defined in main.asm as well, and it's confusing how
the build breaks when you try to remove this unused file.
2017-11-16 23:24:30 +01:00
mid-kid
e21551db62 CeruleanCaveNane -> CeruleanCaveName 2017-11-16 18:19:33 +01:00
mid-kid
fd14253796 Clean up labels in battle/moves/move_effects.asm
There were a lot of unused labels in there, and a few confusing
misnomers around move_effects_pointers.asm. They now match up exactly
with the names in battle_constants.asm.
Also renamed a few effects, to make their purpose clearer, and to match
up with their respective event script commands:
EFFECT_EXPLOSION    -> EFFECT_SELFDESCTRUCT
EFFECT_HAZE         -> EFFECT_RESET_STATS
EFFECT_WHIRLWIND    -> EFFECT_FORCE_SWITCH
EFFECT_BIND         -> EFFECT_TRAP_TARGET
EFFECT_TWINEEDLE    -> EFFECT_POISON_MULTI_HIT
EFFECT_STEEL_WING   -> EFFECT_DEFENSE_UP_HIT
EFFECT_METAL_CLAW   -> EFFECT_ATTACK_UP_HIT
EFFECT_ANCIENTPOWER -> EFFECT_ALL_UP_HIT
2017-11-15 16:36:13 +01:00
pfero
6bb7df7e29 Fix comments in tilesets/roofs.asm
Apparently the first entry in MapGroupRoofs is for the unused mapgroup 0.
Also added useful comments to tilesets/roof.pal.
2017-11-08 00:10:02 +01:00
pfero
999c804f6f Label some functions in gfx/load_pics.asm
A few projects I looked around in used these same labels for these
functions, and it looks like they describe these functions properly.
Also fixed usage of BANK() in a few places.
2017-11-03 01:12:16 +01:00
pfero
88f1b8165b Define GetWarpSFX
This function checks the current tile at the player's feet, and returns
an appropriate SFX that should be played when warping from it.
2017-10-29 11:14:59 +01:00
pfero
7c9a156133 Fix WATERTILE/WALLTILE constants
WATRTILE was wrongly defined as 15, and WALLTILE as 1. Those had to be
flipped around.
This has allowed for us to replace inmediate values with these constants
in several places to improve readability.

WATRTILE was renamed to WATERTILE in the name of readability.
2017-10-28 18:08:24 -04:00
surskitty
88a80619d2 Cianwood City labels 2017-10-26 20:25:36 -04:00
surskitty
3caa8d1cbc Another label. 2017-10-26 19:53:20 -04:00
surskitty
0852c9ad38 Pokefan Derek fully labelled. 2017-10-26 19:48:13 -04:00
surskitty
9f46f07e72 Full script labels for Fuchsia Gym. 2017-10-26 19:38:58 -04:00
surskitty
98c7050563 Cerulean Mart labels 2017-10-26 19:21:42 -04:00
surskitty
394c9f2c24 Partially labelling Pokefan Derek. 2017-10-26 02:26:47 -04:00
surskitty
63287e5648 Some Fuchsia Gym labels. 2017-10-26 02:14:05 -04:00
surskitty
2d185c697d Fuchsia City labels 2017-10-26 02:03:55 -04:00
surskitty
ba0424d79c Celadon Cafe labels. 2017-10-26 01:59:28 -04:00
surskitty
151174300f Labelling triggers pointlessly. 2017-10-26 01:51:13 -04:00
surskitty
14a121f85e Mahogany Gym labels. 2017-10-26 01:23:54 -04:00
surskitty
ed10d336cb Labels for TM people. 2017-10-26 00:52:21 -04:00
surskitty
c76e2c48e0 Labelling Jasmine. 2017-10-26 00:12:32 -04:00
surskitty
71821405ff Labelling some of Morty's scripts. 2017-10-26 00:03:06 -04:00
yenatch
4e4e792474 whitelist shiny.pal 2017-10-25 00:43:40 -04:00
surskitty
6cdc14b920 Labelling a few mom scripts. 2017-10-25 00:34:32 -04:00
surskitty
9a2b212ffd Labelling Sweet Scent. 2017-10-25 00:14:05 -04:00
yenatch
021afb6831 rgbds variables in the makefile
this is for my own convenience but anyone using both rgbds 2 and 3 may find it useful
2017-10-22 02:12:13 -04:00
yenatch
1439887b49 rename pokecrystal.ld -> pokecrystal.link 2017-10-22 02:06:43 -04:00
yenatch
dddf184b07 fix animated pic dumps 2017-10-22 02:04:06 -04:00
yenatch
6f72bfece1 condense japanese pokemon sort 2017-10-22 01:52:57 -04:00
yenatch
7c59c3577d Merge pull request #394 from surskitty/master
Adjusting Indigo League map labels
2017-10-21 21:45:59 -04:00
surskitty
f204a11274 Typo fix. 2017-10-21 00:25:49 -04:00
surskitty
20e88485a5 Renaming labels for E4. 2017-10-21 00:10:00 -04:00
yenatch
77a98f2f44 Merge pull request #390 from yenatch/remove-contents
Remove contents.asm
2017-09-25 17:21:40 -04:00
yenatch
543d67b647 Build tools with -O3.
This improves build time by about 20%.
2017-09-24 15:08:44 -04:00
yenatch
aa19af3822 Rebuild on changes to pokecrystal.ld 2017-09-24 03:30:47 -04:00
yenatch
a950b020cd Align "Sprites" section to $100 bytes.
The code expects this section to be aligned.
2017-09-24 03:27:47 -04:00
yenatch
afe67ba1b4 Remove contents.asm 2017-09-24 03:15:01 -04:00
yenatch
52cd3398bd fix rgbds version in install instructions 2017-09-24 01:34:44 -04:00
yenatch
01caa369ec Merge pull request #379 from yenatch/tools
Refactor scan_includes and add warnings for tools
2017-09-24 01:25:03 -04:00
yenatch
17448c51a5 Merge pull request #389 from yenatch/rgbds-3
rgbds 0.3.3
2017-09-24 01:23:34 -04:00
PikalaxALT
46bc3e4c88 Remove redundant org statements (ax6 will slaughter me) 2017-09-24 01:15:43 -04:00
PikalaxALT
63bc19e33d Make repository compatible with RGBDS 0.3.3 (breaks support for earlier versions of RGBDS) 2017-09-24 01:15:05 -04:00
yenatch
94577d9553 fix warnings in lzcomp and md5 2017-09-24 01:07:08 -04:00