replace warnpc with assert pc <=

Core/message.asm

@@ -48,4 +48,4 @@ MessageExpandedData:
 
 print "End of expanded dialogue          ", pc
 
-warnpc $3CA62A
+assert pc() <= $3CA62A

Dungeons/Objects/object_handler.asm

@@ -56,7 +56,7 @@ org $01B53C
     JSL InitHeavyPot
     JMP DrawBigGraySegment_hook
 
-warnpc $01B560
+assert pc() <= $01B560
 
 org $2C8000
 ; TODO: Fix the graphics used for the heavy pot in game

Dungeons/attract_scenes.asm

@@ -135,7 +135,7 @@ AttractScene_ThroneRoom:
 
   #_0CEFBE: SEP #$20
 }
-warnpc $0CEFC0
+assert pc() <= $0CEFC0
 
 ; ==========================================================
 

Items/bottle_net.asm

@@ -35,7 +35,7 @@ LinkItem_NewBottle:
   RTS
 }
 
-warnpc $07A249
+assert pc() <= $07A249
 
 pullpc
 

Items/fishing_rod.asm

@@ -50,7 +50,7 @@ LinkItem_FishingRodAndPortalRod:
   RTS
 }
 
-warnpc $07AFB4
+assert pc() <= $07AFB4
 
 pullpc
 
@@ -198,7 +198,7 @@ Prizes:
   db $D8, $D2, $D2, $D2, $D9, $DA, $DB, $DC, $DF, $E0, $E1, $D9, $D9, $DA, $D9, $DA
 
 
-;warnpc $07A64A
+;assert pc() <= $07A64A
 
 
 fishingrodgfx:

Items/goldstar.asm

@@ -82,7 +82,7 @@ CheckForBallChain:
 pushpc
 org $08BF2D
   JSL BallChain_DrawOrReturn
-  warnpc $08BF32
+  assert pc() <= $08BF32
 pullpc
 
 ; $22D4C0 - Hooked into AncillaDraw_Hookshot @ _08BF2D

Items/jump_feather.asm

@@ -23,7 +23,7 @@ org $07AFF8 ; LinkItem_BugCatchingNet
 org $07D242
   JSL CheckIfJumpingForSpikeDamage
   NOP #2
-warnpc $07D248
+assert pc() <= $07D248
 
 ; =========================================================
 

Items/ocarina.asm

@@ -85,7 +85,7 @@ Song_of_Storms:
 
   db $00 ; end sfx
 }
-; warnpc $1A8FD4
+; assert pc() <= $1A8FD4
 
 ; A, D, F, A, D, F
 ; SFX3_27 Agahnim charge
@@ -121,7 +121,7 @@ Song_of_Time:
 
   db $00 ; end sfx
 }
-warnpc $1A922B
+assert pc() <= $1A922B
 
 ; =========================================================
 
@@ -485,4 +485,4 @@ RainAnimation_Overridden:
 
     RTL
 }
-warnpc $02A52D
+assert pc() <= $02A52D

Items/portal_rod.asm

@@ -42,7 +42,7 @@ LinkItem_PortalRod:
   RTS
 }
 
-warnpc $07A568
+assert pc() <= $07A568
 
 ; Ancilla_CheckSpriteCollision
 org $088DC3

Masks/bunny_hood.asm

@@ -125,4 +125,4 @@ LinkItem_Ether:
   RTS
 }
 
-warnpc $07A4F6
+assert pc() <= $07A4F6

Masks/deku_mask.asm

@@ -52,7 +52,7 @@ LinkItem_DekuMask:
   RTS
 }
 
-warnpc $07A6BE
+assert pc() <= $07A6BE
 
 ; =========================================================
 
@@ -143,7 +143,7 @@ LinkState_UsingQuake:
   RTS
 }
 
-warnpc $07A779
+assert pc() <= $07A779
 
 ; LinkHop_FindArbitraryLandingSpot
 ; Allow LinkState 0x0A to use velocity

Masks/mask_routines.asm

@@ -1324,7 +1324,7 @@ LinkOAM_DrawShield:
 
   .shield_continue
 }
-warnpc $0DA79C
+assert pc() <= $0DA79C
 
 ; Hide sword while deku hover
 org $0DA5EA

Masks/wolf_mask.asm

@@ -56,7 +56,7 @@ LinkItem_ShovelAndFlute:
   JMP LinkItem_WolfMask
   
 }
-; warnpc $07A31F
+; assert pc() <= $07A31F
 
 ; =========================================================
 

Masks/zora_mask.asm

@@ -60,7 +60,7 @@ LinkItem_ZoraMask:
     RTS
 }
 
-warnpc $07A5CE
+assert pc() <= $07A5CE
 
 ; =========================================================
 
@@ -170,7 +170,7 @@ org $0782D2
   CLC
   RTS
 
-warnpc $0782DA
+assert pc() <= $0782DA
 
 pullpc
 

Menu/menu_select_item.asm

@@ -323,7 +323,7 @@ SearchForEquippedItem:
   JSL SearchForEquippedItem_Override
   RTS
 }
-warnpc $0DE3C7
+assert pc() <= $0DE3C7
 
 ; =========================================================
 

Music/stone_tower_temple.asm

@@ -172,4 +172,4 @@ db $00 ; End of the channel
 db A2, Tie, Tie, Tie, Tie, Tie, Tie, Tie
 db $00 ; End
 
-warnpc $1AB4D5
+assert pc() <= $1AB4D5

Music/stone_tower_temple_v2.asm

@@ -207,4 +207,4 @@ db $00 ; End
 
 
 
-warnpc $1AB4D5
+assert pc() <= $1AB4D5

Overworld/ZCustomOverworld.asm

@@ -142,7 +142,7 @@ Pool:
     ;dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
     ;dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
     ;dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
-    ;warnpc $288140
+    ;assert pc() <= $288140
 
     ; ZS is weird with SW areas, so we are marking the bridge one specifically so we can find it later.
     org $288128
@@ -198,7 +198,7 @@ Pool:
     ;db $00, $00, $00, $00, $00, $00, $00, $00
     ;db $00, $00, $00, $00, $00, $00, $00, $00
     ;db $00, $00, $00, $00, $00, $00, $00, $00
-    ;warnpc $288160
+    ;assert pc() <= $288160
 
     org $288160 ; $140160
     .MainPaletteTable ; 0xA0
@@ -234,7 +234,7 @@ Pool:
     ;db $04, $00, $00, $00, $00, $00, $00, $00
     ;db $00, $00, $00, $00, $00, $00, $00, $00
     ;db $00, $00, $00, $00, $00, $00, $00, $00
-    ;warnpc $288200
+    ;assert pc() <= $288200
     
     org $288200 ; $140200
     .MosaicTable ; 0xA0
@@ -264,7 +264,7 @@ Pool:
     ;db $01, $00, $00, $00, $00, $00, $00, $00
     ;db $00, $00, $00, $00, $00, $00, $00, $00
     ;db $00, $00, $00, $00, $00, $00, $00, $00
-    ;warnpc $2882A0
+    ;assert pc() <= $2882A0
 
     org $2882A0 ; $1402A0
     .AnimatedTable ; 0xA0
@@ -295,7 +295,7 @@ Pool:
     ;db $5B, $5B, $5B, $5B, $5B, $5B, $5B, $5B
     ;db $5B, $5B, $5B, $5B, $5B, $5B, $5B, $5B
     ;db $5B, $5B, $5B, $5B, $5B, $5B, $5B, $5B
-    ;warnpc $288340
+    ;assert pc() <= $288340
 
     org $288340 ; $140340
     .OverlayTable ; 0x140
@@ -338,7 +338,7 @@ Pool:
     ;dw $0093, $00FF, $00FF, $00FF, $00FF, $00FF, $00FF, $00FF
     ;dw $00FF, $00FF, $00FF, $00FF, $00FF, $00FF, $00FF, $00FF
     ;dw $00FF, $00FF, $00FF, $00FF, $00FF, $00FF, $00FF, $00FF
-    ;warnpc $288480
+    ;assert pc() <= $288480
 }
 
 ; Debug addresses
@@ -424,7 +424,7 @@ Func00D8D5:
             
     RTL
 }
-;warnpc $00D8EE
+;assert pc() <= $00D8EE
 
 else
 
@@ -473,7 +473,7 @@ Func00DA63:
         
     RTL
 }
-;warnpc $00DABB
+;assert pc() <= $00DABB
 
 else
 
@@ -572,7 +572,7 @@ Func00EEBB:
         
     RTL
 }
-;warnpc $00EEE0
+;assert pc() <= $00EEE0
 
 else
 
@@ -627,7 +627,7 @@ Func00FF7C:
         
     RTL
 }
-;warnpc $00FFC0 ; This end point also uses up a null block at the end of the function.
+;assert pc() <= $00FFC0 ; This end point also uses up a null block at the end of the function.
 
 else
 
@@ -654,25 +654,25 @@ if !Func0283EE = 1
 org $028027 ; $010027
     JSR PreOverworld_LoadProperties_LoadMain_LoadMusicIfNeeded
 
-;warnpc $02802B
+;assert pc() <= $02802B
 
 ; Dungeon_LoadSongBankIfNeeded:
 org $029C0C ; $011C0C
     JMP PreOverworld_LoadProperties_LoadMain_LoadMusicIfNeeded
 
-;warnpc $029C0F
+;assert pc() <= $029C0F
 
 ; Mirror_LoadMusic:
 org $029D1E ; $011D1E
     JSR PreOverworld_LoadProperties_LoadMain_LoadMusicIfNeeded
 
-;warnpc $029D21
+;assert pc() <= $029D21
 
 ; GanonEmerges_LOadPyramidArea:
 org $029F82 ; $011F82
     JSR PreOverworld_LoadProperties_LoadMain_LoadMusicIfNeeded
 
-;warnpc $029F85
+;assert pc() <= $029F85
 
 ; Changes the function that loads overworld properties when exiting a dungeon.
 ; Includes removing asm that plays music in certain areas and changing how animated tiles are loaded.
@@ -844,7 +844,7 @@ PreOverworld_LoadProperties_LoadMain:
     
     RTS
 }
-;warnpc $02856A ; $01056A
+;assert pc() <= $02856A ; $01056A
 
 else
 
@@ -977,7 +977,7 @@ Func028632:
         
     RTS
 }
-;warnpc $028697
+;assert pc() <= $028697
 
 else
 
@@ -1033,7 +1033,7 @@ Func029AA6:
         
     RTS
 }
-;warnpc $029AD3
+;assert pc() <= $029AD3
 
 else
 
@@ -1265,7 +1265,7 @@ Func02AF58:
         
     RTS
 }
-;warnpc $02B0D2 ; $0130D2
+;assert pc() <= $02B0D2 ; $0130D2
 
 else
 
@@ -1338,7 +1338,7 @@ Func02B2D4:
 
     RTL
 }
-;warnpc $02B2E6 ; $0132E6
+;assert pc() <= $02B2E6 ; $0132E6
 
 else
 
@@ -1429,7 +1429,7 @@ Func02B3A1:
     
     RTL
 }
-;warnpc $02B40A ; $01340A
+;assert pc() <= $02B40A ; $01340A
 
 else
 
@@ -1465,12 +1465,12 @@ Func02BC44:
         JSL BGControl
         BRA .BRANCH_IOTA
     
-    ;warnpc $02BC60 ; $013C60
+    ;assert pc() <= $02BC60 ; $013C60
 
     org $02BC60 ; $013C60
     .BRANCH_IOTA
 }
-;warnpc $02BC60
+;assert pc() <= $02BC60
 
 else
 
@@ -1544,7 +1544,7 @@ Func02C02D:
     
     .dontMoveBg1
 }
-;warnpc $02C039 ; $014039
+;assert pc() <= $02C039 ; $014039
 
 else
 
@@ -1583,7 +1583,7 @@ if !Func02C692 = 1
 org $02A07A ; $01207A
     JSR Overworld_LoadAreaPalettes
 
-;warnpc $02A07D ; $01207D
+;assert pc() <= $02A07D ; $01207D
 
 ; The main overworld palette loading routine un-hardcoded to load the custom main palette.
 org $02C692 ; $014692
@@ -1621,7 +1621,7 @@ Overworld_LoadAreaPalettes:
         
     RTS
 }
-;warnpc $02C6EB ; $0146EB
+;assert pc() <= $02C6EB ; $0146EB
 
 else
 
@@ -1705,7 +1705,7 @@ RainAnimation:
 
     RTL
 }
-;warnpc $02A52D ; $01252D
+;assert pc() <= $02A52D ; $01252D
 
 else
 
@@ -1734,7 +1734,7 @@ if !Func02AADB = 1
 org $02AADB ; $012ADB
     JML MosaicAreaCheck
 
-;warnpc $02AADF ; $012ADF
+;assert pc() <= $02AADF ; $012ADF
 
 else
 
@@ -1781,7 +1781,7 @@ if !Func02ABB8 = 1
 org $02ABB8 ; $012BB8
     JML CheckForChangeGraphicsTransitionLoad
 
-;warnpc $02ABBC ; $012BBC
+;assert pc() <= $02ABBC ; $012BBC
 
 else
 
@@ -1994,7 +1994,7 @@ if !Func0ABC5A = 1
 org $0ABC5A ; $053C5A
     JSL CheckForChangeGraphicsNormalLoad
 
-;warnpc $0ABC5E ; $053C5E
+;assert pc() <= $0ABC5E ; $053C5E
 
 else
 
@@ -2091,7 +2091,7 @@ Func0AB8F5:
         
     RTL
 }
-;warnpc $0AB948 ; $053948
+;assert pc() <= $0AB948 ; $053948
 
 else
 
@@ -2235,7 +2235,7 @@ Overworld_LoadBGColorAndSubscreenOverlay:
         
     RTL
 }
-;warnpc $0BFFA8 ; $05FFA8
+;assert pc() <= $0BFFA8 ; $05FFA8
 
 else
 
@@ -2350,7 +2350,7 @@ org $0ED627 ; $075627
     JML InitColorLoad2
     NOP
 
-;warnpc $0ED62C ; $07562C
+;assert pc() <= $0ED62C ; $07562C
 
 else 
 
@@ -2438,7 +2438,7 @@ Func0ED8AE:
         
     RTL
 }
-;warnpc $0ED8FB ; $0758FB
+;assert pc() <= $0ED8FB ; $0758FB
 
 else
 

Overworld/ZCustomOverworld2.asm

@@ -107,7 +107,7 @@ Pool:
     ;dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
     ;dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
     ;dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000
-    warnpc $288140
+    assert pc() <= $288140
 
     org $288140 ; $140140
     .EnableTable ; 0x20
@@ -175,7 +175,7 @@ Pool:
     ;db $00, $00, $00, $00, $00, $00, $00, $00
     ;db $00, $00, $00, $00, $00, $00, $00, $00
     ;db $00, $00, $00, $00, $00
-    warnpc $288160
+    assert pc() <= $288160
 
     org $288160 ; $140160
     .MainPaletteTable ; 0xA0
@@ -211,7 +211,7 @@ Pool:
     ;db $04, $00, $00, $00, $00, $00, $00, $00
     ;db $00, $00, $00, $00, $00, $00, $00, $00
     ;db $00, $00, $00, $00, $00, $00, $00, $00
-    warnpc $288200
+    assert pc() <= $288200
     
     org $288200 ; $140200
     .MosaicTable ; 0xA0
@@ -241,7 +241,7 @@ Pool:
     ;db $01, $00, $00, $00, $00, $00, $00, $00
     ;db $00, $00, $00, $00, $00, $00, $00, $00
     ;db $00, $00, $00, $00, $00, $00, $00, $00
-    warnpc $2882A0
+    assert pc() <= $2882A0
 
     ; Not the same as OWGFXGroupTable_sheet7. The game uses a combination of $59
     ; and $5B to create the sheet in sheet #7. This is done by first transfering
@@ -280,7 +280,7 @@ Pool:
     ;db $5B, $5B, $5B, $5B, $5B, $5B, $5B, $5B
     ;db $5B, $5B, $5B, $5B, $5B, $5B, $5B, $5B
     ;db $5B, $5B, $5B, $5B, $5B, $5B, $5B, $5B
-    warnpc $288340
+    assert pc() <= $288340
 
     org $288340 ; $140340
     .OverlayTable ; 0x140
@@ -323,7 +323,7 @@ Pool:
     ;dw $0093, $00FF, $00FF, $00FF, $00FF, $00FF, $00FF, $00FF
     ;dw $00FF, $00FF, $00FF, $00FF, $00FF, $00FF, $00FF, $00FF
     ;dw $00FF, $00FF, $00FF, $00FF, $00FF, $00FF, $00FF, $00FF
-    warnpc $288480
+    assert pc() <= $288480
 
     org $288480 ; $140480
     .OWGFXGroupTable ; 0x500 (0xA0 * 0x08)
@@ -546,7 +546,7 @@ Pool:
     ;db $3A, $3B, $3C, $3D, $53, $57, $4C, $5B ; 0x9D
     ;db $3A, $3B, $3C, $3D, $57, $4C, $3E, $5B ; 0x9E
     ;db $3A, $3B, $3C, $3D, $53, $4D, $3E, $5B ; 0x9F
-    warnpc $288980
+    assert pc() <= $288980
 
     ; TODO: Add a way to edit these within ZS? Unsure.
     org $288980 ; $140980
@@ -591,7 +591,7 @@ Pool:
     ; SW
     db $3A, $3B, $3C, $3D, $47, $48, $3E, $5B
 
-    warnpc $288998 ; $140998
+    assert pc() <= $288998 ; $140998
 }
 
 ; Start of expanded space.
@@ -618,7 +618,7 @@ AnimateMirrorWarp_DecompressAnimatedTiles:
             
     RTL
 }
-warnpc $00D8EE
+assert pc() <= $00D8EE
 
 pullpc
 ReadAnimatedTable:
@@ -697,7 +697,7 @@ AnimateMirrorWarp_LoadSubscreen:
         
     RTL
 }
-warnpc $00DABB
+assert pc() <= $00DABB
 
 
 pullpc
@@ -780,7 +780,7 @@ Func00EEBB:
         
     RTL
 }
-warnpc $00EEE0
+assert pc() <= $00EEE0
 
 
 pullpc
@@ -825,7 +825,7 @@ Func00FF7C:
     RTL
 }
 ; This end point also uses up a null block at the end of the function.
-warnpc $00FFC0
+assert pc() <= $00FFC0
 
 
 ; ==============================================================================
@@ -837,25 +837,25 @@ warnpc $00FFC0
 org $028027 ; $010027
     JSR.w PreOverworld_LoadProperties_LoadMain_LoadMusicIfNeeded
 
-warnpc $02802B
+assert pc() <= $02802B
 
 ; Dungeon_LoadSongBankIfNeeded:
 org $029C0C ; $011C0C
     JMP PreOverworld_LoadProperties_LoadMain_LoadMusicIfNeeded
 
-warnpc $029C0F
+assert pc() <= $029C0F
 
 ; Mirror_LoadMusic:
 org $029D1E ; $011D1E
     JSR.w PreOverworld_LoadProperties_LoadMain_LoadMusicIfNeeded
 
-warnpc $029D21
+assert pc() <= $029D21
 
 ; GanonEmerges_LoadPyramidArea:
 org $029F82 ; $011F82
     JSR.w PreOverworld_LoadProperties_LoadMain_LoadMusicIfNeeded
 
-warnpc $029F85
+assert pc() <= $029F85
 
 ; Changes the function that loads overworld properties when exiting a dungeon.
 ; Includes removing asm that plays music in certain areas and changing how
@@ -1028,7 +1028,7 @@ PreOverworld_LoadProperties_LoadMain:
     
     RTS
 }
-warnpc $02856A ; $01056A
+assert pc() <= $02856A ; $01056A
 
 ; ==============================================================================
 
@@ -1085,7 +1085,7 @@ Func028632:
         
     RTS
 }
-warnpc $028697
+assert pc() <= $028697
 
 ; ==============================================================================
 
@@ -1120,7 +1120,7 @@ Func029AA6:
         
     RTS
 }
-warnpc $029AD3
+assert pc() <= $029AD3
 
 ; ==============================================================================
 
@@ -1346,7 +1346,7 @@ CustomOverworld_LoadSubscreenOverlay_PostInit:
         
     RTS
 }
-warnpc $02B0D2 ; $0130D2
+assert pc() <= $02B0D2 ; $0130D2
 
 ; ==============================================================================
 
@@ -1364,7 +1364,7 @@ Func02B2D4:
 
     RTL
 }
-warnpc $02B2E6 ; $0132E6
+assert pc() <= $02B2E6 ; $0132E6
 
 pullpc
 EnableSubScreenCheckForPyramid:
@@ -1441,7 +1441,7 @@ Func02B3A1:
     
     RTL
 }
-warnpc $02B40A ; $01340A
+assert pc() <= $02B40A ; $01340A
 
 
 ; ==============================================================================
@@ -1457,12 +1457,12 @@ Func02BC44:
         JSL BGControl
         BRA .BRANCH_IOTA
     
-    warnpc $02BC60 ; $013C60
+    assert pc() <= $02BC60 ; $013C60
 
     org $02BC60 ; $013C60
     .BRANCH_IOTA
 }
-warnpc $02BC60
+assert pc() <= $02BC60
 
 pullpc
 ReadOverlayArray:
@@ -1539,7 +1539,7 @@ Func02C02D:
     
     .dontMoveBg1
 }
-warnpc $02C039 ; $014039
+assert pc() <= $02C039 ; $014039
 
 pullpc
 ReadOverlayArray2:
@@ -1569,7 +1569,7 @@ pushpc
 org $02A07A ; $01207A
     JSR.w Overworld_LoadAreaPalettes
 
-warnpc $02A07D ; $01207D
+assert pc() <= $02A07D ; $01207D
 
 ; The main overworld palette loading routine un-hardcoded to load the custom
 ; main palette.
@@ -1634,7 +1634,7 @@ Overworld_LoadAreaPalettes:
         
     RTS
 }
-warnpc $02C6EB ; $0146EB
+assert pc() <= $02C6EB ; $0146EB
 
 ; ==============================================================================
 
@@ -1703,7 +1703,7 @@ RainAnimation:
 
     RTL
 }
-warnpc $02A52D ; $01252D
+assert pc() <= $02A52D ; $01252D
 
 ; ==============================================================================
 
@@ -1715,7 +1715,7 @@ warnpc $02A52D ; $01252D
 org $02AADB ; $012ADB
     JML MosaicAreaCheck
 
-warnpc $02AADF ; $012ADF
+assert pc() <= $02AADF ; $012ADF
 
 pullpc
 MosaicAreaCheck:
@@ -1760,7 +1760,7 @@ org $02ABBE ; $012BBE
     JSL NewOverworld_FinishTransGfx
     NOP : NOP : NOP
 
-warnpc $02ABC5 ; $012BC5
+assert pc() <= $02ABC5 ; $012BC5
 
 pullpc
 ; Loads the animated tiles after most of the transition gfx changes take place.
@@ -2193,7 +2193,7 @@ pushpc
 org $0ABC5A ; $053C5A
     JSL CheckForChangeGraphicsNormalLoad
 
-warnpc $0ABC5E ; $053C5E
+assert pc() <= $0ABC5E ; $053C5E
 
 ; Loads the animated tiles after the overworld map is closed.
 pullpc
@@ -2266,7 +2266,7 @@ Func0AB8F5:
         
     RTL
 }
-warnpc $0AB948 ; $053948
+assert pc() <= $0AB948 ; $053948
 
 pullpc
 LoadAmbientSound:
@@ -2395,7 +2395,7 @@ Overworld_LoadBGColorAndSubscreenOverlay:
         
     RTL
 }
-warnpc $0BFFA8 ; $05FFA8
+assert pc() <= $0BFFA8 ; $05FFA8
 
 pullpc
 print "ReplaceBGColor: ", pc
@@ -2481,7 +2481,7 @@ org $0ED627 ; $075627
     JML InitColorLoad2
     NOP
 
-warnpc $0ED62C ; $07562C
+assert pc() <= $0ED62C ; $07562C
 
 org $0ED652
 InitColorLoad2_Return:
@@ -2562,7 +2562,7 @@ Func0ED8AE:
         
     RTL
 }
-warnpc $0ED8FB ; $0758FB
+assert pc() <= $0ED8FB ; $0758FB
 
 ; ==============================================================================
 
@@ -2572,12 +2572,12 @@ warnpc $0ED8FB ; $0758FB
 org $00D673 ; $005673
     JML NewLoadTransAuxGFX
 
-warnpc $00D677 ; $005677
+assert pc() <= $00D677 ; $005677
 
 org $008C8A ; $000C8A
 dw NMI_UpdateChr_Bg2HalfAndAnimated
 
-warnpc $00D677 ; $005677
+assert pc() <= $00D677 ; $005677
 
 ; Replaces the UNREACHABLE_00D585 which is unused.
 org $00D585 ; $005585
@@ -2621,7 +2621,7 @@ NMI_UpdateChr_Bg2HalfAndAnimated:
     RTS
 }
 
-warnpc $00D5CB ; $0055CB
+assert pc() <= $00D5CB ; $0055CB
 
 pullpc
 
@@ -2788,22 +2788,22 @@ pushpc
 org $00E221 ; $006221
     JML InitTilesetsLongCalls
 
-warnpc $00E225 ; $006225
+assert pc() <= $00E225 ; $006225
 
 org $00D904 ; $005904
     JML AnimateMirrorWarp_DecompressNewTileSetsLongCalls
 
-warnpc $00D908 ; $005908
+assert pc() <= $00D908 ; $005908
 
 org $00D97D ; $00597D
     JML AnimateMirrorWarp_DecompressNewTileSetsLongCalls2
 
-warnpc $00D981 ; $005981
+assert pc() <= $00D981 ; $005981
 
 org $00D9BC ; $0059BC
     JML AnimateMirrorWarp_DecompressBackgroundsALongCalls
 
-warnpc $00D9C1 ; $0059C1
+assert pc() <= $00D9C1 ; $0059C1
 
 org $00DA2F ; $005A2F
     JML AnimateMirrorWarp_DecompressBackgroundsCLongCalls

Overworld/world_map.asm

@@ -386,7 +386,7 @@ FixMaskPaletteOnExit:
   RTL
 }
 
-warnpc $0AC387
+assert pc() <= $0AC387
 
 org $0ABC76
   JSL FixMaskPaletteOnExit

Sprites/Bosses/lanmola.asm

@@ -572,7 +572,7 @@ Lanmola_DrawMound:
 
 ; ==============================================================================
 
-warnpc $05A880
+assert pc() <= $05A880
 
 ; ==============================================================================
 org $1DCFCB
@@ -632,4 +632,4 @@ Sprite_Shrapnel:
     
 ; ==============================================================================
 
-warnpc $1DD02A
+assert pc() <= $1DD02A

Sprites/Bosses/twinrova.asm

@@ -1164,7 +1164,7 @@ Follower_BasicMover:
     LDA.b #$15 : STA.w $012C
 
     RTS
-    warnpc $09A23A
+    assert pc() <= $09A23A
   
   org $09A23A
   .no_blind_transform
@@ -1260,7 +1260,7 @@ Blind_SpawnFromMaiden:
   RTL
 }
 
-warnpc $1DA081
+assert pc() <= $1DA081
 
 ; =========================================================
 ; We are using space from this function to insert the 
@@ -1303,7 +1303,7 @@ SpritePrep_Blind_PrepareBattle:
     RTL
 }
 
-warnpc $1DA0B1
+assert pc() <= $1DA0B1
 
 org $01B3E1
   RoomDraw_BombableFloor:

Sprites/NPCs/followers.asm

@@ -285,7 +285,7 @@ SpritePrep_Locksmith:
 
   RTS
 }
-warnpc $068D7F
+assert pc() <= $068D7F
 
 SpriteDraw_Locksmith = $06BDAC
 Sprite_CheckIfActive_Bank06 = $06D9EC
@@ -425,7 +425,7 @@ Sprite_39_ZoraBaby:
   }
 }
 print "End of Sprite 39 Locksmith          ", pc
-warnpc $06BD9C
+assert pc() <= $06BD9C
 
 pullpc
 

Sprites/NPCs/fortune_teller.asm

@@ -187,4 +187,4 @@ JMP.w FortuneTeller_DisplayMessage
 #_0DC92A: LDA.b #$0F
 #_0DC92C: JSR FortuneTeller_PrepareNextMessage
 
-warnpc $0DC92F
+assert pc() <= $0DC92F

Sprites/NPCs/maku_tree.asm

@@ -122,9 +122,10 @@ Sprite_MakuTree_Main:
   {
     %ShowSolicitedMessage($22) : BCC .no_talk
       LDA.l $7EF3D6 : ORA.b #$02 : STA.l $7EF3D6
-      LDA.l CRYSTALS : BNE .no_essences
+      ; TODO: Activate when dreams are implemented
-        INC.w SprAction, X
+      ; LDA.l CRYSTALS : BNE .no_essences
-      .no_essences
+      ;   INC.w SprAction, X
+      ; .no_essences
     .no_talk
     RTS
   }

Sprites/NPCs/ranch_girl.asm

@@ -92,5 +92,5 @@ ChickenLady:
   #_1AFEFF: RTS
 }
 
-warnpc $01AFEFF
+assert pc() <= $01AFEFF
 pullpc

Sprites/all_sprites.asm

@@ -207,7 +207,7 @@ print  "End of ice_block.asm              ",  pc
 incsrc "Sprites/NPCs/ranch_girl.asm"
 print  "End of Ranch Girl.asm             ", pc
 
-warnpc $328000
+assert pc() <= $328000
 
 ; =========================================================
 
@@ -314,7 +314,7 @@ org $0083F8
   .notInCutscene
   RTS
 
-warnpc $00841E
+assert pc() <= $00841E
 
 ; =========================================================
 
@@ -344,7 +344,7 @@ ShopItem_Banana:
   .error
   JSR $F38A ; ShopItem_PlayBeep
 }
-warnpc $1EF2AB
+assert pc() <= $1EF2AB
 
 ; =========================================================