diff options
| author | YamaArashi <shadow962@live.com> | 2016-11-05 14:57:02 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-11-05 15:10:37 -0700 |
| commit | 716476e798c19e528bfa502444118d7fb412f88d (patch) | |
| tree | 7b8169062d4848ed2edd4fa98add7fff135b3909 /data | |
| parent | e31301d6ea7a772df3f25b7ce60d261e0c039cc0 (diff) | |
script special variables
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 35 | ||||
| -rw-r--r-- | data/scripts/berry_tree.inc | 4 |
2 files changed, 20 insertions, 19 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 4289b6e8c..382d7c880 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1,6 +1,7 @@ .include "asm/macros.inc" .include "asm/macros/event.inc" .include "constants/constants.inc" + .include "constants/variables.inc" .section script_data, "aw", %progbits @@ -9,24 +10,24 @@ .align 2 gSpecialVars:: - .4byte 0x202e8c4 - .4byte 0x202e8c6 - .4byte 0x202e8c8 - .4byte 0x202e8ca - .4byte 0x202e8cc - .4byte 0x202e8ce - .4byte 0x202e8d0 - .4byte 0x202e8d2 - .4byte 0x202e8d4 - .4byte 0x202e8d6 - .4byte 0x202e8d8 - .4byte 0x202e8da - .4byte 0x202e8e0 + .4byte gSpecialVar_0x8000 + .4byte gSpecialVar_0x8001 + .4byte gSpecialVar_0x8002 + .4byte gSpecialVar_0x8003 + .4byte gSpecialVar_0x8004 + .4byte gSpecialVar_0x8005 + .4byte gSpecialVar_0x8006 + .4byte gSpecialVar_0x8007 + .4byte gSpecialVar_0x8008 + .4byte gSpecialVar_0x8009 + .4byte gSpecialVar_0x800A + .4byte gSpecialVar_0x800B + .4byte gScriptFacing .4byte gScriptResult - .4byte 0x203855e - .4byte 0x202e8de - .4byte 0x203869e - .4byte 0x203869c + .4byte gScriptItemId + .4byte gScriptLastTalked + .4byte gSpecialVar_0x8010 + .4byte gSpecialVar_0x8011 .include "data/specials.inc" diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index f6d98689e..fcf32d15d 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -43,9 +43,9 @@ Route102_EventScript_1A1577:: @ 81A1577 closebutton special 44 waitstate - compare 0x800e, 0 + compare ITEM_ID, 0 jumpeq Route102_EventScript_1A1593 - removeitem 0x800e, 1 + removeitem ITEM_ID, 1 call Route102_EventScript_1A16A9 Route102_EventScript_1A1593:: @ 81A1593 |