diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-28 21:39:28 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-03-28 21:39:28 -0400 |
| commit | 0f618efb15b2ca6248d73c979fab7df248563e5a (patch) | |
| tree | 581d1a5c7be1ab204439a390ff19ca231f0d2b6e /data | |
| parent | 781aa8949c1e7ea0b1ac2c7fa3ae36226e98c289 (diff) | |
Finish overworld.c
Diffstat (limited to 'data')
| -rw-r--r-- | data/maps/RecordCenter/map.json | 8 | ||||
| -rw-r--r-- | data/overworld.s | 29 | ||||
| -rw-r--r-- | data/scripts/cable_club.inc | 6 |
3 files changed, 9 insertions, 34 deletions
diff --git a/data/maps/RecordCenter/map.json b/data/maps/RecordCenter/map.json index 19b310814..ad4308513 100644 --- a/data/maps/RecordCenter/map.json +++ b/data/maps/RecordCenter/map.json @@ -67,7 +67,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot" + "script": "RecordCenter_EventScript_Spot0" }, { "type": "trigger", @@ -76,7 +76,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot" + "script": "RecordCenter_EventScript_Spot1" }, { "type": "trigger", @@ -85,7 +85,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot" + "script": "RecordCenter_EventScript_Spot2" }, { "type": "trigger", @@ -94,7 +94,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "RecordCenter_EventScript_Spot" + "script": "RecordCenter_EventScript_Spot3" } ], "bg_events": [] diff --git a/data/overworld.s b/data/overworld.s deleted file mode 100644 index e37dfbcf4..000000000 --- a/data/overworld.s +++ /dev/null @@ -1,29 +0,0 @@ -#include "constants/flags.h" -#include "constants/maps.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - .section .rodata - .align 2, 0 - - .align 2 -gUnknown_826D33C:: @ 826D33C - .4byte sub_8058684 - .4byte sub_80586A4 - .4byte sub_80586A8 - -gUnknown_826D348:: @ 826D348 - .4byte sub_80586C8 - .4byte sub_80586CC - .4byte sub_80586CC - .4byte sub_80586CC - .4byte sub_80586CC - .4byte sub_80586C8 - .4byte sub_80586C8 - .4byte sub_8058734 - .4byte sub_8058734 - .4byte sub_8058734 - .4byte sub_8058734 - -gUnknown_826D374:: @ 826D374 - .4byte sub_805874C - .4byte sub_8058754 diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 01b0d9b34..1053c1028 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -702,7 +702,11 @@ TradeCenter_EventScript_Chair3:: @ 81BB974 end @ Nop in FRLG -RecordCenter_EventScript_Spot:: @ 81BB980 +@ Separate labels to match GetDirectionForEventScript +RecordCenter_EventScript_Spot0:: @ 81BB980 +RecordCenter_EventScript_Spot1:: @ 81BB980 +RecordCenter_EventScript_Spot2:: @ 81BB980 +RecordCenter_EventScript_Spot3:: @ 81BB980 end CableClub_EventScript_ReadTrainerCard:: @ 81BB981 |