diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-26 16:31:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-26 16:31:02 -0400 |
| commit | 553cb9bc82e751da5fa940d797aaf474d998f8a4 (patch) | |
| tree | c3a35971e9c5bbd274d61728f2cf4882eb65e40c /engine | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
| parent | 35821ec58c244be1f5cb670e07873e8a875c10a5 (diff) | |
Merge pull request #754 from Rangi42/master
Use def_* macros for automatic map event counts
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/npc_trade.asm | 6 | ||||
| -rw-r--r-- | engine/overworld/player_object.asm | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index f7ec0f23e..0f9c7d9f5 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -188,10 +188,10 @@ DoNPCTrade: ld e, NPCTRADE_DIALOG call GetTradeAttribute ld a, [hl] - cp TRADE_DIALOG_COMPLETE - ld b, RESET_FLAG + cp TRADE_DIALOGSET_GIRL + ld b, CAUGHT_BY_UNKNOWN jr c, .incomplete - ld b, SET_FLAG + ld b, CAUGHT_BY_GIRL .incomplete farcall SetGiftPartyMonCaughtData diff --git a/engine/overworld/player_object.asm b/engine/overworld/player_object.asm index 8bb9d273e..41b8797cf 100644 --- a/engine/overworld/player_object.asm +++ b/engine/overworld/player_object.asm @@ -55,6 +55,7 @@ PlayerObjectTemplate: ; A dummy map object used to initialize the player object. ; Shorter than the actual amount copied by two bytes. ; Said bytes seem to be unused. +_NUM_OBJECT_EVENTS = 0 object_event -4, -4, SPRITE_CHRIS, SPRITEMOVEDATA_PLAYER, 15, 15, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, 0, -1 CopyDECoordsToMapObject:: |