summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-09More WRAM organizationRemy Oukaour
2017-12-09Start organizing WRAMRemy Oukaour
- Use db and dw when they're more meaningful than ds 1/2 - Use unions to group related labels
2017-12-09More constantsRemy Oukaour
2017-12-09Separate file for mobile constantsRemy Oukaour
2017-12-09Define more charmap characters and use them in place of hard-coded numbersRemy Oukaour
2017-12-09Document constants with comments, actual names, and more thorough usageRemy Oukaour
2017-12-06style guideyenatch
2017-12-06Merge pull request #405 from yenatch/fix-no-rule-erroryenatch
fix cryptic 'no rule' error when a prerequisite is missing
2017-12-06Merge pull request #404 from surskitty/masteryenatch
De-Magic-Numbers the Rocket Grunts
2017-12-06Merge pull request #403 from mid-kid/masteryenatch
mid-kid's patches: The Experience
2017-12-03fix make 3.81yenatch
the shell newline capture doesnt work in 3.81, so that's gone
2017-12-03fix cryptic 'no rule' error when a prerequisite is missingyenatch
at the cost of scan_includes running before the rules are actually evaluated
2017-12-03Merge branch 'master' of github.com:pret/pokecrystalsurskitty
2017-11-30Remove useless filemid-kid
Also fixed a comment on top of music_pointers.asm
2017-11-30Label all of PARTYMENUACTION_*mid-kid
It's pretty clear what it's used for. PartyMenuActionText is used for two things: 1) Storing what kind of action we're going to do (<$10) 2) Storing the text for some kind of healing stuff I'm not entirely sure (>=$f0) In the former case, if GetPartyMenuTilemapPointers is ran, it will be used to pick a sequence of actions that should be done, specified in the table, and it'll print the corresponding string using the PartyMenuStrings table. The items in the sequence of actions that should be done are in WritePartyMenuTilemap. Strangely enough, one possible value is left completely unused: PARTYMENUACTION_GIVE_MON_FEMALE. It works in the exact same way as it's male counterpart, and as such I don't believe it was used in the japanese version either, since it doesn't matter which gender your 'mon is when you put 'em in the daycare.
2017-11-29Merge pull request #400 from mid-kid/masterMarcus Huderle
mid-kid's amazing patches act 2
2017-11-29Fix some SPRITE_ANIM_FRAMESET_ constantsmid-kid
Thanks to @roukaour for the fixes.
2017-11-27Making all Rocket Grunts call the constant.surskitty
2017-11-27Constants for Rocket Grunt rosters.surskitty
Having constants rather than magic numbers should make it easier to remove unused grunts from the roster.
2017-11-27Fighting Dojo npc labels.surskitty
2017-11-26Rename all files in data/pokedex/entries/mid-kid
Some people suggested this would be a good idea, and make management of the files easier. I'm inclined to agree.
2017-11-26Add MobileError-related labelsmid-kid
This function is called from a few different places in the mobile code, including from one special that is only executed when the BattleTowerRoomMenu special returns with a non-zero code. Since that special causes a blue "error" screen to appear, that looks the exact same as the one you'd get when trying to connect from the mobile trade corner/battle colosseum in a Pokémon Center's top floor, and this function contains a bunch of japanese strings in a jumptable, I think it's reasonable to assume it should be called "DisplayMobileError".
2017-11-26Script_ChoseChallenge -> Script_ChooseChallengemid-kid
This script is called for the player to *choose* (or pick) the challenge they want to undertake.
2017-11-25Label BattleTowerRoomMenumid-kid
All of the functions called by it are prefixed with BattleTowerRoomMenu, but a bunch of them seem more generic than that, since they're part of different mobile menus. Also called another menu jumptable BattleTowerRoomMenu2 for the lack of a better name (only the Yes/No menu functions are used in western crystal). The names of the more generic functions should be fixed when we start labelling other menus.
2017-11-21Merge pull request #395 from surskitty/masterMarcus Huderle
Some Script Labels
2017-11-21Merge pull request #397 from mid-kid/masterMarcus Huderle
A few more labels and comments
2017-11-22PewterPokeCEnter2FBeta -> PewterPokeCenter2FBetamid-kid
Probably a typo.
2017-11-21Move LoadOverworldFont to main.asmmid-kid
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-20Move all of constants/sram_constants.asm into srammid-kid
This way we can easily use `BANK()` where appropriate, and it is more tidy.
2017-11-20width -> weightmid-kid
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-19DetermineMobileBattleResult -> DisplayLinkBattleResultmid-kid
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-19Labelled some battle tower-related functionsmid-kid
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-18SelfDestruct -> Selfdestructmid-kid
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-16Define bank43 in main.asm instead of unused_titlemid-kid
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-16CeruleanCaveNane -> CeruleanCaveNamemid-kid
2017-11-15Clean up labels in battle/moves/move_effects.asmmid-kid
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-08Fix comments in tilesets/roofs.asmpfero
Apparently the first entry in MapGroupRoofs is for the unused mapgroup 0. Also added useful comments to tilesets/roof.pal.
2017-11-03Label some functions in gfx/load_pics.asmpfero
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-10-29Define GetWarpSFXpfero
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-28Fix WATERTILE/WALLTILE constantspfero
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-26Cianwood City labelssurskitty
2017-10-26Another label.surskitty
2017-10-26Pokefan Derek fully labelled.surskitty
2017-10-26Full script labels for Fuchsia Gym.surskitty
2017-10-26Cerulean Mart labelssurskitty
2017-10-26Partially labelling Pokefan Derek.surskitty
2017-10-26Some Fuchsia Gym labels.surskitty
2017-10-26Fuchsia City labelssurskitty
2017-10-26Celadon Cafe labels.surskitty
2017-10-26Labelling triggers pointlessly.surskitty