summaryrefslogtreecommitdiff
path: root/mobile
AgeCommit message (Collapse)Author
2018-02-25Merge branch 'master' of https://github.com/pret/pokecrystalRangi
# Conflicts: # constants/map_constants.asm # constants/wram_constants.asm # data/radio/oaks_pkmn_talk_routes.asm # data/radio/pnp_hidden_places.asm # engine/battle/core.asm # engine/breeding.asm # engine/phone/phone_scripts.asm # engine/radio.asm # maps/BattleTower1F.asm # maps/OlivineLighthouse2F.asm # maps/OlivineLighthouse6F.asm # maps/PokemonFanClub.asm # maps/RadioTower1F.asm # maps/RadioTower2F.asm # maps/Route30BerryHouse.asm # maps/Route34IlexForestGate.asm # maps/Route36NationalParkGate.asm # maps/RuinsOfAlphKabutoChamber.asm # maps/RuinsOfAlphResearchCenter.asm # maps/VermilionPort.asm # maps/VictoryRoad.asm
2018-02-25Merge pull request #477 from mid-kid/masteryenatch
Medium-sized cleanups
2018-02-22Label wPokemonWithdrawDepositParameter of RemoveMonFromPartyOrBoxmid-kid
It takes a clearly different parameter, completely unrelated and different in function to PC_DEPOSIT and PC_WITHDRAW.
2018-02-22Fix TRUE/FALSE constants for CalcMonStatsmid-kid
2018-02-22Pkmn -> Monmid-kid
Since we're aiming for consistency across the codebase, I believe it includes a uniform way to refer to the creatures this game consists of in the labels of the code. The only exceptions to this rule are labels referring to things named through the use of the <PK><MN> or <PKMN> characters, in which case PKMN is used. Most of this was already consistent enough™, I just picked the convention with the most occurences and fixed the outliers.
2018-02-15Merge branch 'master' of https://github.com/pret/pokecrystalRangi
# Conflicts: # maps/KrissHouse2F.asm
2018-02-04Fix more w-izing edge cases.luckytyphlosion
2018-02-04Sync code with wikiRangi
2018-02-03Merge branch 'master' of https://github.com/pret/pokecrystalRangi
# Conflicts: # audio/engine.asm # constants/gfx_constants.asm # constants/map_data_constants.asm # constants/pokemon_data_constants.asm # constants/sprite_constants.asm # constants/wram_constants.asm # data/maps/data.asm # engine/battle/ai/scoring.asm # engine/battle/core.asm # engine/battle/effect_commands.asm # engine/battle/misc.asm # engine/battle_anims/getpokeballwobble.asm # engine/breeding.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/events/battle_tower/battle_tower.asm # engine/events/battle_tower/rules.asm # engine/events/buena.asm # engine/events/bug_contest/contest_2.asm # engine/events/daycare.asm # engine/events/dratini.asm # engine/events/halloffame.asm # engine/events/happiness_egg.asm # engine/events/kurt.asm # engine/events/lucky_number.asm # engine/events/magnet_train.asm # engine/events/overworld.asm # engine/events/pokerus/pokerus.asm # engine/events/print_unown.asm # engine/events/print_unown_2.asm # engine/events/unown_walls.asm # engine/item_effects.asm # engine/link.asm # engine/mon_menu.asm # engine/player_object.asm # engine/routines/playslowcry.asm # engine/scripting.asm # engine/search.asm # engine/search2.asm # engine/specials.asm # engine/start_menu.asm # engine/timeset.asm # home/battle_vars.asm # home/map.asm # maps/GoldenrodUndergroundSwitchRoomEntrances.asm # maps/IlexForest.asm # maps/KrissHouse2F.asm # maps/Route39Barn.asm # mobile/mobile_12_2.asm # mobile/mobile_40.asm # mobile/mobile_5f.asm # wram.asm
2018-02-03map → map_id; map_def → map; map_data → map_attributesRangi
2018-02-02use "x + -1" not "x +- 1"Rangi
(TODO: use "x - 1" once rgbds allows it)
2018-01-30Fix wVirtualOAM labels, part 2.luckytyphlosion
2018-01-24Remove "UnusedSpecial_" prefixes tooRangi
2018-01-24Remove Special_ prefix from special routines (close #478)Rangi
2018-01-24Rename some routines to avoid conflicts when removing "Special_" prefixesRangi
2018-01-23Prefix wram labels with w, part 2.luckytyphlosion
2018-01-23Prefix wram labels with w, part 1.luckytyphlosion
Handle edge cases first.
2018-01-23MenuDataHeader → MenuHeader, MenuData2 → MenuData (might complete issue ↵Rangi
#440)
2018-01-23wGameTimerPause bit flag constantsRangi
2018-01-22tile+color macros in gfx.asmRangi
2018-01-22KrissHouse → PlayersHouseRangi
2018-01-22wStatusFlags/2 bit constantsRangi
2018-01-22More engine flag constantsRangi
2018-01-22wUnlockedUnowns engine flag constantsRangi
Use local labels for "End"ings
2018-01-21wGBCOnlyDecompressBufferRemy Oukaour
2018-01-20PARTY_LENGTH; MON_NAME; sgb_border.binRemy Oukaour
2018-01-20Rename BATTLETOWER_NROF constantsRemy Oukaour
2018-01-19Japanese characters in Japanese text (e.g. "ォ" not "," for $f4)Remy Oukaour
2018-01-19More Japanese charactersRemy Oukaour
2018-01-19Use hSerialConnectionStatus constants elsewhereRemy Oukaour
2018-01-19Resolve #471 (although link code still needs more cleanup, like its WRAM labels)Remy Oukaour
2018-01-19Keep hex address until surrounding code is cleaned upRemy Oukaour
2018-01-19More UnicodeRemy Oukaour
2018-01-19wrong bankRemy Oukaour
2018-01-18Disambiguate "%" and "<NO>"Remy Oukaour
2018-01-18Remove trailing whitespaceRemy Oukaour
2018-01-18Use Japanese charmap definitions in stringsRemy Oukaour
2018-01-18Only graphics data goes in gfx/Remy Oukaour
Introduce PALRGB_WHITE constant for $7fff
2018-01-18Eliminate wd000Remy Oukaour
2018-01-16"CryHeader" → "Cry"; "Cry" → "MonCry"Remy Oukaour
2018-01-16map_header → map_def; map_header_2 → map_dataRemy Oukaour
2018-01-16Avoid "+- 1" at every maskbitsRemy Oukaour
2018-01-16Remove Predef_ prefix from routines listed in PredefPointersRemy Oukaour
2018-01-15_Special_BugContestJudging → _BugContestJudging; ↵Remy Oukaour
HOF_Predef_AnimateFrontpic → Predef_HOF_AnimateFrontpic (close #473)
2018-01-14Merge branch 'master' of https://github.com/mid-kid/pokecrystal (resolve PR ↵Remy Oukaour
#452) # Conflicts: # data/player_names.asm # engine/battle/menu.asm # engine/billspc.asm # engine/billspctop.asm # engine/buy_sell_toss.asm # engine/decorations.asm # engine/delete_save_change_clock.asm # engine/events/buena.asm # engine/events/elevator.asm # engine/events/kurt.asm # engine/events/mom.asm # engine/events/move_tutor.asm # engine/events/pokecenter_pc.asm # engine/events/pokepic.asm # engine/events/std_scripts.asm # engine/events/unown_walls.asm # engine/init_gender.asm # engine/intro_menu.asm # engine/mail.asm # engine/main_menu.asm # engine/mart.asm # engine/menu_2.asm # engine/mon_menu.asm # engine/pack.asm # engine/slot_machine.asm # engine/start_menu.asm # home/menu.asm # maps/CeladonDeptStore6F.asm # maps/CeladonGameCornerPrizeRoom.asm # maps/DragonShrine.asm # maps/EarlsPokemonAcademy.asm # maps/GoldenrodCity.asm # maps/GoldenrodDeptStore6F.asm # maps/GoldenrodGameCorner.asm # maps/GoldenrodPokeComCenter2FMobile.asm # mobile/mobile_12.asm # mobile/mobile_12_2.asm # mobile/mobile_22.asm # mobile/mobile_22_2.asm # mobile/mobile_40.asm # mobile/mobile_45.asm # mobile/mobile_45_sprite_engine.asm # mobile/mobile_46.asm # mobile/mobile_5c.asm # mobile/mobile_5f.asm # mobile/mobile_menu.asm
2018-01-14Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal ↵Remy Oukaour
(resolve PR #460) # Conflicts: # engine/battle/core.asm # engine/save.asm
2018-01-14Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR ↵Remy Oukaour
#459) # Conflicts: # data/items/descriptions.asm # data/sprite_anims/framesets.asm # engine/crystal_colors.asm # engine/events/kurt.asm # engine/events/special.asm # engine/events/std_scripts.asm # engine/events_3.asm # engine/item_effects.asm # engine/namingscreen.asm # engine/scripting.asm # engine/stats_screen.asm # engine/trade_animation.asm # home/audio.asm # main.asm # maps/BattleTower1F.asm # maps/BattleTowerBattleRoom.asm # maps/BurnedTowerB1F.asm # maps/ElmsLab.asm # maps/GoldenrodDeptStore5F.asm # maps/GoldenrodUnderground.asm # maps/HallOfFame.asm # maps/MahoganyTown.asm # maps/ManiasHouse.asm # maps/MobileBattleRoom.asm # maps/MobileTradeRoomMobile.asm # maps/RadioTower2F.asm # maps/Route35NationalParkGate.asm # maps/Route36NationalParkGate.asm # maps/Route39Farmhouse.asm # tilesets/palette_maps.asm
2018-01-14GFX tile sizes in decimalRemy Oukaour
2018-01-14More Battle Tower map script constants, fewer raw hex valuesRemy Oukaour
2018-01-14Use constants for menu flagsmid-kid
Added a bunch of constants for the bitflags of each kind of menu. Some are slightly vague or too long, but I'm not sure how to else name them.