File tree Expand file tree Collapse file tree 4 files changed +10
-10
lines changed Expand file tree Collapse file tree 4 files changed +10
-10
lines changed Original file line number Diff line number Diff line change 1
1
; marcelnote - new location
2
2
CinnabarVolcano1FB1F_Script:
3
3
ld hl , wCurrentMapScriptFlags
4
- bit 5 , [ hl ] ; this is set upon entering the map
5
- res 5 , [ hl ]
4
+ bit BIT_CUR_MAP_LOADED_1 , [ hl ] ; this is set upon entering the map
5
+ res BIT_CUR_MAP_LOADED_1 , [ hl ]
6
6
call nz , CinnabarVolcano1FB1FCheckBoulderEventScript
7
7
call EnableAutoTextBoxDrawing
8
8
; new
Original file line number Diff line number Diff line change 3
3
; boulder events are reset in CinnabarIsland map
4
4
CinnabarVolcano2F_Script:
5
5
ld hl , wCurrentMapScriptFlags
6
- bit 6 , [ hl ] ; this is set upon entering the map
7
- res 6 , [ hl ]
6
+ bit BIT_CUR_MAP_LOADED_2 , [ hl ] ; this is set upon entering the map
7
+ res BIT_CUR_MAP_LOADED_2 , [ hl ]
8
8
call nz , CinnabarVolcano2FCheckBoulder1EventScript ; check first boulder upon entering
9
9
ld hl , wCurrentMapScriptFlags
10
- bit 5 , [ hl ] ; this is set upon entering the map
11
- res 5 , [ hl ]
10
+ bit BIT_CUR_MAP_LOADED_1 , [ hl ] ; this is set upon entering the map
11
+ res BIT_CUR_MAP_LOADED_1 , [ hl ]
12
12
call nz , CinnabarVolcano2FCheckBouldersEventScript
13
13
call EnableAutoTextBoxDrawing
14
14
ld hl , CinnabarVolcano2FTrainerHeaders
Original file line number Diff line number Diff line change 2
2
MtMoonSquare_Script:
3
3
call EnableAutoTextBoxDrawing
4
4
ld hl , wCurrentMapScriptFlags
5
- bit 5 , [ hl ]
6
- res 5 , [ hl ]
5
+ bit BIT_CUR_MAP_LOADED_1 , [ hl ]
6
+ res BIT_CUR_MAP_LOADED_1 , [ hl ]
7
7
ret z
8
8
call Random
9
9
cp 25 ; prob_spawning = (n+1)/256
Original file line number Diff line number Diff line change @@ -18,8 +18,8 @@ SilphFactory2FResetScripts:
18
18
19
19
SilphFactory2FGateCallbackScript: ; marcelnote - adapted from SilphCo9FGateCallbackScript
20
20
ld hl , wCurrentMapScriptFlags
21
- bit 5 , [ hl ]
22
- res 5 , [ hl ]
21
+ bit BIT_CUR_MAP_LOADED_1 , [ hl ]
22
+ res BIT_CUR_MAP_LOADED_1 , [ hl ]
23
23
ret z
24
24
ld hl , .GateCoordinates
25
25
call SilphFactory2F_SetCardKeyDoorYScript
You can’t perform that action at this time.
0 commit comments