diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-05-25 14:19:02 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-05-25 14:19:02 -0400 |
| commit | 578aa99786c397af83d307fab2bfa2c49b114e57 (patch) | |
| tree | 49daae81676a551b90d2a48270664dca6be98cd0 | |
| parent | 9c8425730feb2a56a677444f221a923a44b105f3 (diff) | |
Small cleanups
| -rw-r--r-- | Add-a-new-Pokémon.md | 3 | ||||
| -rw-r--r-- | Add-a-new-TM-or-HM.md | 8 | ||||
| -rw-r--r-- | Edit-the-male-and-female-player-colors.md | 2 | ||||
| -rw-r--r-- | Evolution-moves.md | 5 |
4 files changed, 6 insertions, 12 deletions
diff --git a/Add-a-new-Pokémon.md b/Add-a-new-Pokémon.md index f537c33..6ebc608 100644 --- a/Add-a-new-Pokémon.md +++ b/Add-a-new-Pokémon.md @@ -235,9 +235,6 @@ Then edit [data/pokemon/egg_moves.asm](../blob/master/data/pokemon/egg_moves.asm -SnorlaxEggMoves: +MunchlaxEggMoves: db LICK --if !_CRYSTAL -- db CHARM --endc db -1 ; end ``` diff --git a/Add-a-new-TM-or-HM.md b/Add-a-new-TM-or-HM.md index 7c0aa89..8f3e3ff 100644 --- a/Add-a-new-TM-or-HM.md +++ b/Add-a-new-TM-or-HM.md @@ -20,7 +20,7 @@ Edit [constants/item_constants.asm](../blob/master/constants/item_constants.asm) ```diff add_tm: MACRO if !DEF(TM01) - TM01 = const_value + TM01 EQU const_value enum_start 1 endc define _\@_1, "TM_\1" @@ -33,11 +33,11 @@ Edit [constants/item_constants.asm](../blob/master/constants/item_constants.asm) ... add_tm NIGHTMARE ; f2 + add_tm AEROBLAST - NUM_TMS = const_value - TM01 - 2 ; discount ITEM_C3 and ITEM_DC + NUM_TMS EQU const_value - TM01 - 2 ; discount ITEM_C3 and ITEM_DC add_hm: MACRO if !DEF(HM01) - HM01 = const_value + HM01 EQU const_value endc define _\@_1, "HM_\1" const _\@_1 @@ -48,7 +48,7 @@ Edit [constants/item_constants.asm](../blob/master/constants/item_constants.asm) ... add_hm WATERFALL ; f9 + add_hm SOFTBOILED - NUM_HMS = const_value - HM01 + NUM_HMS EQU const_value - HM01 ``` The `add_tm` and `add_hm` macros simultaneously define the next item constant (`TM_AEROBLAST` and `HM_SOFTBOILED` respectively) and the next `TMNUM` constant (`AEROBLAST_TMNUM` and `SOFTBOILED_TMNUM`). The item constants are used for `giveitem` scripts, in Mart inventories, etc. The `TMNUM` constants are not used directly, but get referred to by the `tmhm` learnsets in Pokémon base data. (We'll see how that works later.) diff --git a/Edit-the-male-and-female-player-colors.md b/Edit-the-male-and-female-player-colors.md index ab581e4..8321a2f 100644 --- a/Edit-the-male-and-female-player-colors.md +++ b/Edit-the-male-and-female-player-colors.md @@ -388,7 +388,7 @@ Edit [engine/events/magnet_train.asm](../blob/master/engine/events/magnet_train. ```diff .InitPlayerSpriteAnim: - ld d, 10 * 8 + 5 + ld d, (8 + 2) * TILE_WIDTH + 5 ld a, [wMagnetTrainPlayerSpriteInitX] ld e, a - ld b, SPRITE_ANIM_INDEX_MAGNET_TRAIN_RED diff --git a/Evolution-moves.md b/Evolution-moves.md index a74de2b..039d1be 100644 --- a/Evolution-moves.md +++ b/Evolution-moves.md @@ -200,12 +200,9 @@ Edit [data/pokemon/evos_attacks.asm](../blob/master/data/pokemon/evos_attacks.as MagnetonEvosAttacks: ... --if _CRYSTAL - db 35, TRI_ATTACK + db 29, TRI_ATTACK --else - db 35, SWIFT --endc ++ db 35, SWIFT ; from G/S ... DoduoEvosAttacks: |