Revert "Factor out tables into data/overworld/"

This reverts commit 3f392c279248562068a80ceaf2884f62a18f6e17.

1 files changed, 164 insertions, 1 deletions

diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 8f4506b0..4d395c63 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -61,7 +61,170 @@ RunScriptCommand:
 	rst JumpTable
 	ret
 
-INCLUDE "data/overworld/scripting.asm"
+ScriptCommandTable:
+; entries correspond to *_command constants (see macros/scripts/events.asm)
+	dw Script_scall                      ; 00
+	dw Script_farscall                   ; 01
+	dw Script_memcall                    ; 02
+	dw Script_sjump                      ; 03
+	dw Script_farsjump                   ; 04
+	dw Script_memjump                    ; 05
+	dw Script_ifequal                    ; 06
+	dw Script_ifnotequal                 ; 07
+	dw Script_iffalse                    ; 08
+	dw Script_iftrue                     ; 09
+	dw Script_ifgreater                  ; 0a
+	dw Script_ifless                     ; 0b
+	dw Script_jumpstd                    ; 0c
+	dw Script_callstd                    ; 0d
+	dw Script_callasm                    ; 0e
+	dw Script_special                    ; 0f
+	dw Script_memcallasm                 ; 10
+	dw Script_checkmapscene              ; 11
+	dw Script_setmapscene                ; 12
+	dw Script_checkscene                 ; 13
+	dw Script_setscene                   ; 14
+	dw Script_setval                     ; 15
+	dw Script_addval                     ; 16
+	dw Script_random                     ; 17
+	dw Script_checkver                   ; 18
+	dw Script_readmem                    ; 19
+	dw Script_writemem                   ; 1a
+	dw Script_loadmem                    ; 1b
+	dw Script_readvar                    ; 1c
+	dw Script_writevar                   ; 1d
+	dw Script_loadvar                    ; 1e
+	dw Script_giveitem                   ; 1f
+	dw Script_takeitem                   ; 20
+	dw Script_checkitem                  ; 21
+	dw Script_givemoney                  ; 22
+	dw Script_takemoney                  ; 23
+	dw Script_checkmoney                 ; 24
+	dw Script_givecoins                  ; 25
+	dw Script_takecoins                  ; 26
+	dw Script_checkcoins                 ; 27
+	dw Script_addcellnum                 ; 28
+	dw Script_delcellnum                 ; 29
+	dw Script_checkcellnum               ; 2a
+	dw Script_checktime                  ; 2b
+	dw Script_checkpoke                  ; 2c
+	dw Script_givepoke                   ; 2d
+	dw Script_giveegg                    ; 2e
+	dw Script_givepokemail               ; 2f
+	dw Script_checkpokemail              ; 30
+	dw Script_checkevent                 ; 31
+	dw Script_clearevent                 ; 32
+	dw Script_setevent                   ; 33
+	dw Script_checkflag                  ; 34
+	dw Script_clearflag                  ; 35
+	dw Script_setflag                    ; 36
+	dw Script_wildon                     ; 37
+	dw Script_wildoff                    ; 38
+	dw Script_xycompare                  ; 39
+	dw Script_warpmod                    ; 3a
+	dw Script_blackoutmod                ; 3b
+	dw Script_warp                       ; 3c
+	dw Script_getmoney                   ; 3d
+	dw Script_getcoins                   ; 3e
+	dw Script_getnum                     ; 3f
+	dw Script_getmonname                 ; 40
+	dw Script_getitemname                ; 41
+	dw Script_getcurlandmarkname         ; 42
+	dw Script_gettrainername             ; 43
+	dw Script_getstring                  ; 44
+	dw Script_itemnotify                 ; 45
+	dw Script_pocketisfull               ; 46
+	dw Script_opentext                   ; 47
+	dw Script_refreshscreen              ; 48
+	dw Script_closetext                  ; 49
+	dw Script_writeunusedbytebuffer      ; 4a
+	dw Script_farwritetext               ; 4b
+	dw Script_writetext                  ; 4c
+	dw Script_repeattext                 ; 4d
+	dw Script_yesorno                    ; 4e
+	dw Script_loadmenu                   ; 4f
+	dw Script_closewindow                ; 50
+	dw Script_jumptextfaceplayer         ; 51
+	dw Script_jumptext                   ; 52
+	dw Script_waitbutton                 ; 53
+	dw Script_promptbutton               ; 54
+	dw Script_pokepic                    ; 55
+	dw Script_closepokepic               ; 56
+	dw Script__2dmenu                    ; 57
+	dw Script_verticalmenu               ; 58
+	dw Script_loadpikachudata            ; 59
+	dw Script_randomwildmon              ; 5a
+	dw Script_loadtemptrainer            ; 5b
+	dw Script_loadwildmon                ; 5c
+	dw Script_loadtrainer                ; 5d
+	dw Script_startbattle                ; 5e
+	dw Script_reloadmapafterbattle       ; 5f
+	dw Script_catchtutorial              ; 60
+	dw Script_trainertext                ; 61
+	dw Script_trainerflagaction          ; 62
+	dw Script_winlosstext                ; 63
+	dw Script_scripttalkafter            ; 64
+	dw Script_endifjustbattled           ; 65
+	dw Script_checkjustbattled           ; 66
+	dw Script_setlasttalked              ; 67
+	dw Script_applymovement              ; 68
+	dw Script_applymovementlasttalked    ; 69
+	dw Script_faceplayer                 ; 6a
+	dw Script_faceobject                 ; 6b
+	dw Script_variablesprite             ; 6c
+	dw Script_disappear                  ; 6d
+	dw Script_appear                     ; 6e
+	dw Script_follow                     ; 6f
+	dw Script_stopfollow                 ; 70
+	dw Script_moveobject                 ; 71
+	dw Script_writeobjectxy              ; 72
+	dw Script_loademote                  ; 73
+	dw Script_showemote                  ; 74
+	dw Script_turnobject                 ; 75
+	dw Script_follownotexact             ; 76
+	dw Script_earthquake                 ; 77
+	dw Script_changemapblocks            ; 78
+	dw Script_changeblock                ; 79
+	dw Script_reloadmap                  ; 7a
+	dw Script_reloadmappart              ; 7b
+	dw Script_writecmdqueue              ; 7c
+	dw Script_delcmdqueue                ; 7d
+	dw Script_playmusic                  ; 7e
+	dw Script_encountermusic             ; 7f
+	dw Script_musicfadeout               ; 80
+	dw Script_playmapmusic               ; 81
+	dw Script_dontrestartmapmusic        ; 82
+	dw Script_cry                        ; 83
+	dw Script_playsound                  ; 84
+	dw Script_waitsfx                    ; 85
+	dw Script_warpsound                  ; 86
+	dw Script_specialsound               ; 87
+	dw Script_autoinput                  ; 88
+	dw Script_newloadmap                 ; 89
+	dw Script_pause                      ; 8a
+	dw Script_deactivatefacing           ; 8b
+	dw Script_prioritysjump              ; 8c
+	dw Script_warpcheck                  ; 8d
+	dw Script_stopandsjump               ; 8e
+	dw Script_endcallback                ; 8f
+	dw Script_end                        ; 90
+	dw Script_reloadend                  ; 91
+	dw Script_endall                     ; 92
+	dw Script_pokemart                   ; 93
+	dw Script_elevator                   ; 94
+	dw Script_trade                      ; 95
+	dw Script_askforphonenumber          ; 96
+	dw Script_phonecall                  ; 97
+	dw Script_hangup                     ; 98
+	dw Script_describedecoration         ; 99
+	dw Script_fruittree                  ; 9a
+	dw Script_specialphonecall           ; 9b
+	dw Script_checkphonecall             ; 9c
+	dw Script_verbosegiveitem            ; 9d
+	dw Script_swarm                      ; 9e
+	dw Script_halloffame                 ; 9f
+	dw Script_credits                    ; a0
+	dw Script_warpfacing                 ; a1
 
 StartScript:
 	ld hl, wScriptFlags