fight documentation

Makefile

@@ -559,6 +559,9 @@ build/$(VERSION)/src/core1/done/io/sptask.c.o: OPT_FLAGS = -O1
 build/$(VERSION)/src/core1/done/ll.c.o: OPT_FLAGS := -O1
 build/$(VERSION)/src/core1/done/ll.c.o: MIPSBIT := -mips3 -o32
 
+build/$(VERSION)/src/fight/code_180.c.o: OPT_FLAGS := -O2 -g0
+
+
 build/$(VERSION)/src/bk_boot_27F0.c.o: OPT_FLAGS = -O2
 build/$(VERSION)/src/done/destroythread.c.o: OPT_FLAGS := -O1
 build/$(VERSION)/src/done/pirawdma.c.o: OPT_FLAGS := -O1

include/enums.h

@@ -1859,9 +1859,24 @@ enum actor_e
     ACTOR_387_PORTRAIT_OF_TEEHEE,
     ACTOR_388_PORTRAIT_OF_MINION,
 
+    ACTOR_38B_GRUNTILDA_FINAL_BOSS = 0x38B,
+
     ACTOR_39F_FIGHT_FLIGHT_PAD = 0x39F,
     ACTOR_3A0_ICECUBE_B,
 
+    ACTOR_3A2_JINJO_STATUE = 0x3A2,
+
+    ACTOR_3A5_BOSS_JINJO_ORANGE = 0x3A5,
+    ACTOR_3A6_BOSS_JINJO_GREEN,
+    ACTOR_3A7_BOSS_JINJO_PINK,
+    ACTOR_3A8_BOSS_JINJO_YELLOW,
+    ACTOR_3A9_JINJONATOR_STATUE,
+
+    ACTOR_3AB_GRUNTY_SPELL_BARRIER = 0x3AB,
+    ACTOR_3AC_JINJONATOR = 0x3AC,
+
+    ACTOR_3AF_GRUNTY_SHADOW = 0x3AF,
+
     ACTOR_3BA_UNKOWN        = 0x3ba,
 
     ACTOR_3BF_GRUNTLING_BLUE = 0x3bf,
@@ -2639,14 +2654,15 @@ enum asset_e
     // Unused
     // Unused
     // Unused
-    // 3bb Yellow Jinjo
+    ASSET_3BB_MODEL_JINJO_YELLOW = 0x3BB,
+    ASSET_3BC_MODEL_JINJO_ORANGE,
     // 3bc Orange Jinjo
     // 3bd TTC Lighthouse A
     // 3be TTC Lighthouse B
     ASSET_3BF_MODEL_PLAYER_SHADOW = 0x3BF,
     // 3c0 Blue Jinjo
-    // 3c1 Pink Jinjo
-    // 3c2 Green Jinjo
+    ASSET_3C1_MODEL_JINJO_PINK = 0x3C2,
+    ASSET_3C2_MODEL_JINJO_GREEN,
     // Unused
     // Unused
     ASSET_3C5_MODEL_GRUBLIN           = 0x3c5,
@@ -3027,7 +3043,7 @@ enum asset_e
     // 53a Shrapnel Eye (Upon Death)
     // 53b Shrapnel Spike (Upon Death)
     // 53c Shrapnel Metal Plate (Upon Death)
-    // 53d Gruntilda On Broomstick
+    ASSET_53D_MODEL_GRUNTILDA_FINAL_BOSS = 0x53D,
     // 53e Gnawty's Bed
     // 53f Gnawty's Shelves
     // 540 GL Shock Jump Pad Switch
@@ -3036,7 +3052,7 @@ enum asset_e
     // 543 Final Battle Jinjo Stand
     // 544 Final Battle Jinjonator Stand
     // 545 Final Battle Stone Jinjo
-    // 546 Grunty's Barrier Spell
+    ASSET_546_MODEL_GRUNTY_BARRIER_SPELL = 0x546,
     // 547 GL Blue Egg Refill Pillow
     // 548 GL Red Feather Refill Pillow
     // 549 GL Gold Feather Refill Pillow
@@ -3047,7 +3063,7 @@ enum asset_e
     // 54e Copyright Info (Title Screen)
     // 54f Cheato
     // 550 Large Door To Final Battle
-    // 551 Jinjonator
+    ASSET_551_JINJONATOR = 0x551,
     // 552 Broomstick Head (Upon Breaking)
     // 553 Broomstick Shaft Short (Upon Breaking)
     // 554 Broomstick Shaft Long (Upon Breaking)
@@ -3950,8 +3966,16 @@ enum marker_e{
     MARKER_25A_PORTRAIT_OF_TEEHEE,
     MARKER_25B_PORTRAIT_OF_MINION,
 
-    MARKER_25F_ICECUBE_B = 0x25F,
+    MARKER_25E_GRUNTILDA_FINAL_BOSS = 0x25E,
+    MARKER_25F_ICECUBE_B,
 
+    MARKER_27B_BOSS_JINJO_ORANGE = 0x27B,
+    MARKER_27C_BOSS_JINJO_GREEN,
+    MARKER_27D_BOSS_JINJO_PINK,
+    MARKER_27E_BOSS_JINJO_YELLOW,
+
+    MARKER_284_GRUNTY_SPELL_BARRIER = 0x284,
+    MARKER_285_JINJONATOR,
 
     MARKER_295_GRUNTLING_BLUE = 0x295,
     MARKER_296_TEEHEE_PURPLE,

include/prevent_bss_reordering.h

@@ -0,0 +1,83 @@
+#ifndef PREVENT_BSS_REORDERING_H
+#define PREVENT_BSS_REORDERING_H
+
+/**
+ * To determine variable order for .bss, the compiler sorts variables by their
+ * "name index" mod 256, where name index is something that, with -g, gets
+ * incremented by struct and variable declarations, typedefs, and file markers,
+ * among else. (Without -g, only variable declarations affects the index.)
+ * This file contains enough dummy declarations to bump the index by 128.
+ * Including it, or removing the include, should fix bss reordering problems
+ * for a file, assuming the name index distance between its first and last bss
+ * variable is at most 128.
+ * Note that if a variable is declared "extern" within a header file, the name
+ * index is taken at that point of the extern declaration. Thus, this include
+ * must come before any such header.
+ */
+
+struct Dummy0 { int x; };
+struct Dummy1 { int x; };
+struct Dummy2 { int x; };
+struct Dummy3 { int x; };
+struct Dummy4 { int x; };
+struct Dummy5 { int x; };
+struct Dummy6 { int x; };
+struct Dummy7 { int x; };
+struct Dummy8 { int x; };
+struct Dummy9 { int x; };
+struct Dummy10 { int x; };
+struct Dummy11 { int x; };
+struct Dummy12 { int x; };
+struct Dummy13 { int x; };
+struct Dummy14 { int x; };
+struct Dummy15 { int x; };
+struct Dummy16 { int x; };
+struct Dummy17 { int x; };
+struct Dummy18 { int x; };
+struct Dummy19 { int x; };
+struct Dummy20 { int x; };
+struct Dummy21 { int x; };
+struct Dummy22 { int x; };
+struct Dummy23 { int x; };
+struct Dummy24 { int x; };
+struct Dummy25 { int x; };
+struct Dummy26 { int x; };
+struct Dummy27 { int x; };
+struct Dummy28 { int x; };
+struct Dummy29 { int x; };
+struct Dummy30 { int x; };
+struct Dummy31 { int x; };
+struct Dummy32 { int x; };
+struct Dummy33 { int x; };
+struct Dummy34 { int x; };
+struct Dummy35 { int x; };
+struct Dummy36 { int x; };
+struct Dummy37 { int x; };
+struct Dummy38 { int x; };
+struct Dummy39 { int x; };
+struct Dummy40 { int x; };
+struct Dummy41 { int x; };
+struct Dummy42 { int x; };
+struct Dummy43 { int x; };
+struct Dummy44 { int x; };
+struct Dummy45 { int x; };
+struct Dummy46 { int x; };
+struct Dummy47 { int x; };
+struct Dummy48 { int x; };
+struct Dummy49 { int x; };
+struct Dummy50 { int x; };
+struct Dummy51 { int x; };
+struct Dummy52 { int x; };
+struct Dummy53 { int x; };
+struct Dummy54 { int x; };
+struct Dummy55 { int x; };
+struct Dummy56 { int x; };
+struct Dummy57 { int x; };
+struct Dummy58 { int x; };
+struct Dummy59 { int x; };
+struct Dummy60 { int x; };
+struct Dummy61 { int x; };
+struct Dummy62 { int x; };
+typedef int Dummy63;
+
+#endif

src/fight/code_8390.c

@@ -27,7 +27,7 @@ void func_8038E844(Actor *this);
 
 /* .data */
 ActorInfo D_80391AD0 = {
-    0x284, 0x3AB, 0x546, 0x1, NULL,
+    MARKER_284_GRUNTY_SPELL_BARRIER, ACTOR_3AB_GRUNTY_SPELL_BARRIER, ASSET_546_MODEL_GRUNTY_BARRIER_SPELL, 0x1, NULL,
     func_8038E844, func_80326224, func_80325888,
     0, 0, 0.0f, 0
 };

src/fight/code_87A0.c

@@ -76,7 +76,7 @@ f32 D_80391DA4[4] = {0.0f, 0.01f, 0.7f, 0.8f};
 f32 D_80391DB4[2] = {0.0f, 0.65f}; 
 
 /* .bss */
-u8 pad[0x180]; //TODO!!!! define other file .bss sections
+u8 pad[0x10]; //TODO!!!! define other file .bss sections
 u8 D_803928E0;
 u8 D_803928E1;
 u8 D_803928E2;
@@ -86,7 +86,7 @@ u8 D_803928E5;
 f32 D_803928E8[3];
 f32 D_803928F8[3];
 f32 D_80392908[3];
-extern f32 D_80392914;
+// extern f32 D_80392914;
 
 /* .code */
 void func_8038EB90(ActorMarker *arg0, f32 *arg1) {

src/fight/code_AED0.c

@@ -7,7 +7,7 @@ void func_80391360(Actor *this);
 
 /* .data */
 ActorInfo D_80392090 = {
-    0x288, 0x3AF, 0x3BF, 0x1, NULL,
+    0x288, ACTOR_3AF_GRUNTY_SHADOW, 0x3BF, 0x1, NULL,
     func_80391360, func_80326224, func_803912C0,
     0, 0, 0.0f, 0
 };

subyaml/fight.us.v10.yaml

@@ -41,8 +41,12 @@ segments:
       - [0x9850, c, code_9850] #DONE
       - [0x9D40, c, code_9D40] #DONE
       - [0xAED0, c, code_AED0] #DONE
-
-      - [0xAF90, linker, data] # Data section
+  - name: fight-data
+    dir: fight
+    type: code
+    start: 0xAF90
+    vram: 0x80391380
+    subsegments:
       - [0xAF90, .data, code_180]
       - [0xB420, .data, code_5ED0]
       - [0xB5A0, .data, code_6E90]