Rename bigmap-id enum entries (#3380)

also fixed some docstrings that were swapped

decompiler/config/jak2/all-types.gc

@@ -7006,26 +7006,26 @@ This is static data loaded from the DVD at boot."
 (defenum bigmap-id
   :type uint32
   (bigmap-id-0 0)
-  (bigmap-id-1 1)
-  (bigmap-id-2 2)
-  (bigmap-id-3 3)
-  (bigmap-id-4 4)
-  (bigmap-id-5 5)
-  (bigmap-id-6 6)
-  (bigmap-id-7 7)
-  (bigmap-id-8 8)
-  (bigmap-id-9 9)
+  (caspad 1)
+  (castle 2)
+  (dig1 3)
+  (dig3 4)
+  (drill 5)
+  (forest 6)
+  (fortress 7)
+  (mountain 8)
+  (nest 9)
   (bigmap-id-10 10)
-  (bigmap-id-11 11)
-  (bigmap-id-12 12)
-  (bigmap-id-13 13)
+  (palcab 11)
+  (palent 12)
+  (ruins 13)
   (sewer-default 14)
   (sewer-with-board-area 15)
-  (bigmap-id-16 16)
-  (bigmap-id-17 17)
-  (bigmap-id-18 18)
-  (bigmap-id-19 19)
-  (bigmap-id-20 20))
+  (sewesc 16)
+  (strip 17)
+  (tomb 18)
+  (under 19)
+  (city 20))
 ;; ---level-h:bigmap-id
 
 (deftype level-load-info (basic)
@@ -45784,10 +45784,10 @@ Consists of a header and a list of [[merc-effect]]s."
 
 (define-extern check-drop-level-palroof-drop-userdata "TODO" (function sparticle-system sparticle-cpuinfo matrix none))
 (define-extern palroof-deactivate
-  "Sets [[palshaft.bigmap-id]] to `11` and [[*math-camera*.f]] to `20,000` meters"
+  "Sets [[palshaft.bigmap-id]] to `20` and [[*math-camera*.f]] to `10,000` meters"
   (function none))
 (define-extern palroof-activate
-  "Sets [[palshaft.bigmap-id]] to `20` and [[*math-camera*.f]] to `10,000` meters"
+  "Sets [[palshaft.bigmap-id]] to `11` and [[*math-camera*.f]] to `20,000` meters"
   (function none))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

goal_src/jak2/engine/level/level-h.gc

@@ -125,26 +125,26 @@
 (defenum bigmap-id
   :type uint32
   (bigmap-id-0 0)
-  (bigmap-id-1 1)
-  (bigmap-id-2 2)
-  (bigmap-id-3 3)
-  (bigmap-id-4 4)
-  (bigmap-id-5 5)
-  (bigmap-id-6 6)
-  (bigmap-id-7 7)
-  (bigmap-id-8 8)
-  (bigmap-id-9 9)
+  (caspad 1)
+  (castle 2)
+  (dig1 3)
+  (dig3 4)
+  (drill 5)
+  (forest 6)
+  (fortress 7)
+  (mountain 8)
+  (nest 9)
   (bigmap-id-10 10)
-  (bigmap-id-11 11)
-  (bigmap-id-12 12)
-  (bigmap-id-13 13)
+  (palcab 11)
+  (palent 12)
+  (ruins 13)
   (sewer-default 14)
   (sewer-with-board-area 15)
-  (bigmap-id-16 16)
-  (bigmap-id-17 17)
-  (bigmap-id-18 18)
-  (bigmap-id-19 19)
-  (bigmap-id-20 20))
+  (sewesc 16)
+  (strip 17)
+  (tomb 18)
+  (under 19)
+  (city 20))
 ;; ---bigmap-id
 
 

goal_src/jak2/levels/palace/palent-part.gc

@@ -343,14 +343,14 @@
 
 (defun palent-deactivate ()
   "Sets [[palshaft.bigmap-id]] to `20`"
-  (set! (-> palshaft bigmap-id) (bigmap-id bigmap-id-20))
+  (set! (-> palshaft bigmap-id) (bigmap-id city))
   0
   (none)
   )
 
 (defun palent-activate ()
   "Sets [[palshaft.bigmap-id]] to `12`"
-  (set! (-> palshaft bigmap-id) (bigmap-id bigmap-id-12))
+  (set! (-> palshaft bigmap-id) (bigmap-id palent))
   0
   (none)
   )

goal_src/jak2/levels/palace/roof/palroof-part.gc

@@ -410,16 +410,16 @@
   )
 
 (defun palroof-deactivate ()
-  "Sets [[palshaft.bigmap-id]] to `11` and [[*math-camera*.f]] to `20,000` meters"
-  (set! (-> palshaft bigmap-id) (bigmap-id bigmap-id-20))
+  "Sets [[palshaft.bigmap-id]] to `20` and [[*math-camera*.f]] to `10,000` meters"
+  (set! (-> palshaft bigmap-id) (bigmap-id city))
   (set! (-> *math-camera* f) (meters 10000))
   0
   (none)
   )
 
 (defun palroof-activate ()
-  "Sets [[palshaft.bigmap-id]] to `20` and [[*math-camera*.f]] to `10,000` meters"
-  (set! (-> palshaft bigmap-id) (bigmap-id bigmap-id-11))
+  "Sets [[palshaft.bigmap-id]] to `11` and [[*math-camera*.f]] to `20,000` meters"
+  (set! (-> palshaft bigmap-id) (bigmap-id palcab))
   (set! (-> *math-camera* f) (meters 20000))
   0
   (none)

goal_src/jak2/levels/palace/shaft/palshaft-part.gc

@@ -745,7 +745,7 @@
 
 (defun palshaft-deactivate ()
   "Sets [[palshaft.bigmap-id]] to `20`"
-  (set! (-> palshaft bigmap-id) (bigmap-id bigmap-id-20))
+  (set! (-> palshaft bigmap-id) (bigmap-id city))
   0
   (none)
   )

test/decompiler/reference/jak2/levels/palace/palent-part_REF.gc

@@ -374,7 +374,7 @@
 ;; WARN: Return type mismatch int vs none.
 (defun palent-deactivate ()
   "Sets [[palshaft.bigmap-id]] to `20`"
-  (set! (-> palshaft bigmap-id) (bigmap-id bigmap-id-20))
+  (set! (-> palshaft bigmap-id) (bigmap-id city))
   0
   (none)
   )
@@ -383,7 +383,7 @@
 ;; WARN: Return type mismatch int vs none.
 (defun palent-activate ()
   "Sets [[palshaft.bigmap-id]] to `12`"
-  (set! (-> palshaft bigmap-id) (bigmap-id bigmap-id-12))
+  (set! (-> palshaft bigmap-id) (bigmap-id palent))
   0
   (none)
   )

test/decompiler/reference/jak2/levels/palace/roof/palroof-part_REF.gc

@@ -444,8 +444,8 @@
 ;; definition for function palroof-deactivate
 ;; WARN: Return type mismatch int vs none.
 (defun palroof-deactivate ()
-  "Sets [[palshaft.bigmap-id]] to `11` and [[*math-camera*.f]] to `20,000` meters"
-  (set! (-> palshaft bigmap-id) (bigmap-id bigmap-id-20))
+  "Sets [[palshaft.bigmap-id]] to `20` and [[*math-camera*.f]] to `10,000` meters"
+  (set! (-> palshaft bigmap-id) (bigmap-id city))
   (set! (-> *math-camera* f) (meters 10000))
   0
   (none)
@@ -454,8 +454,8 @@
 ;; definition for function palroof-activate
 ;; WARN: Return type mismatch int vs none.
 (defun palroof-activate ()
-  "Sets [[palshaft.bigmap-id]] to `20` and [[*math-camera*.f]] to `10,000` meters"
-  (set! (-> palshaft bigmap-id) (bigmap-id bigmap-id-11))
+  "Sets [[palshaft.bigmap-id]] to `11` and [[*math-camera*.f]] to `20,000` meters"
+  (set! (-> palshaft bigmap-id) (bigmap-id palcab))
   (set! (-> *math-camera* f) (meters 20000))
   0
   (none)

test/decompiler/reference/jak2/levels/palace/shaft/palshaft-part_REF.gc

@@ -792,7 +792,7 @@
 ;; WARN: Return type mismatch int vs none.
 (defun palshaft-deactivate ()
   "Sets [[palshaft.bigmap-id]] to `20`"
-  (set! (-> palshaft bigmap-id) (bigmap-id bigmap-id-20))
+  (set! (-> palshaft bigmap-id) (bigmap-id city))
   0
   (none)
   )