Age | Commit message (Collapse) | Author |
|
|
|
# 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
|
|
|
|
|
|
|
|
|
|
Handle edge cases first.
|
|
|
|
|
|
|
|
|
|
|
|
HOF_Predef_AnimateFrontpic → Predef_HOF_AnimateFrontpic (close #473)
|
|
#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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$100` or `X >> 8` and `X & $ff`
|
|
|
|
|
|
- Use db and dw when they're more meaningful than ds 1/2
- Use unions to group related labels
|
|
|
|
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".
|
|
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.
|
|
|
|
|
|
|
|
colon; remove trailing whitespace; globally correct line endings to UNIX style
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|