diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle_anims/anim_commands.asm | 2 | ||||
| -rw-r--r-- | engine/items/items.asm | 2 | ||||
| -rw-r--r-- | engine/movie/trade_animation.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/movement.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 2 | ||||
| -rw-r--r-- | engine/phone/phone.asm | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index f6c50b72f..76a85a76a 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -326,7 +326,7 @@ RunBattleAnimCommand: jp hl BattleAnimCommands:: -; entries correspond to macros/scripts/battle_anims.asm enumeration +; entries correspond to anim_* constants (see macros/scripts/battle_anims.asm) dw BattleAnimCmd_Obj dw BattleAnimCmd_1GFX dw BattleAnimCmd_2GFX diff --git a/engine/items/items.asm b/engine/items/items.asm index ef0f10dda..a08f76d31 100644 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -570,7 +570,7 @@ GetItemPrice: ; Return the price of wCurItem in de. push hl push bc - ld a, ITEMATTR_PRICE + ld a, ITEMATTR_PRICE_LO call GetItemAttr ld e, a ld a, ITEMATTR_PRICE_HI diff --git a/engine/movie/trade_animation.asm b/engine/movie/trade_animation.asm index 32ab0fa8c..8e6c5a587 100644 --- a/engine/movie/trade_animation.asm +++ b/engine/movie/trade_animation.asm @@ -231,7 +231,7 @@ DoTradeAnimation: jumptable .JumpTable, wJumptableIndex .JumpTable: -; entries correspond to macros/scripts/trade_anims.asm enumeration +; entries correspond to tradeanim_* constants (see macros/scripts/trade_anims.asm) dw TradeAnim_AdvanceScriptPointer ; 00 dw TradeAnim_ShowGivemonData ; 01 dw TradeAnim_ShowGetmonData ; 02 diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index bc978ef0c..d4296576e 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -1,5 +1,5 @@ MovementPointers: -; entries correspond to macros/scripts/movement.asm enumeration +; entries correspond to movement_* constants (see macros/scripts/movement.asm) dw Movement_turn_head_down ; 00 dw Movement_turn_head_up ; 01 dw Movement_turn_head_left ; 02 diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 5104ba92b..708dedf50 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -62,7 +62,7 @@ RunScriptCommand: ret ScriptCommandTable: -; entries correspond to macros/scripts/events.asm enumeration +; entries correspond to *_command constants (see macros/scripts/events.asm) dw Script_scall ; 00 dw Script_farscall ; 01 dw Script_memcall ; 02 diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index cb11aefde..042fe38f3 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -353,7 +353,7 @@ Function90199: ld hl, PHONE_CONTACT_SCRIPT1_BANK add hl, de ld b, [hl] - ld hl, PHONE_CONTACT_SCRIPT1_ADDR_LO + ld hl, PHONE_CONTACT_SCRIPT1_ADDR add hl, de ld a, [hli] ld h, [hl] |