diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-15 01:19:00 -0400 |
| commit | 31ded7cc6f40876421c7186e15f8a9fa606ff569 (patch) | |
| tree | 831d96edb6d2b4d239affc57ef98d6ccb2f1bccb /data/maps/SecretBase_YellowCave4/scripts.inc | |
| parent | 2e789dbbdc18f56cba62aef51156d44136b20632 (diff) | |
| parent | 8e1537fb57dc7ed17079b30f7a3851132cf462bd (diff) | |
Merge branch 'master' into pokenav-decomp-again
Diffstat (limited to 'data/maps/SecretBase_YellowCave4/scripts.inc')
| -rw-r--r-- | data/maps/SecretBase_YellowCave4/scripts.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc index 32da39388..805d7e299 100644 --- a/data/maps/SecretBase_YellowCave4/scripts.inc +++ b/data/maps/SecretBase_YellowCave4/scripts.inc @@ -1,12 +1,12 @@ SecretBase_YellowCave4_MapScripts:: @ 823B483 - map_script 4, SecretBase_RedCave1_MapScript2_23B498 - map_script 3, SecretBase_RedCave1_MapScript1_23B4A2 - map_script 2, SecretBase_RedCave1_MapScript2_23B4AE - map_script 5, SecretBase_RedCave1_MapScript1_23B4B8 + map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_RedCave1_MapScript2_23B498 + map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_RedCave1_MapScript1_23B4A2 + map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_RedCave1_MapScript2_23B4AE + map_script MAP_SCRIPT_ON_RESUME, SecretBase_RedCave1_MapScript1_23B4B8 .byte 0 SecretBase_RedCave1_MapScript2_23B498: @ 823B498 - map_script_2 VAR_0x4089, 0, EventScript_275D0C + map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, EventScript_275D0C .2byte 0 SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2 @@ -16,7 +16,7 @@ SecretBase_RedCave1_MapScript1_23B4A2: @ 823B4A2 end SecretBase_RedCave1_MapScript2_23B4AE: @ 823B4AE - map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_275B81 + map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_RedCave1_EventScript_275B81 .2byte 0 SecretBase_RedCave1_MapScript1_23B4B8: @ 823B4B8 |