Move gContestOpponents into C

2,400 LOC by hand.
2019-03-09 20:56:36 -05:00
parent 0e8f94a83e
commit a32e8e7405
5 changed files with 2787 additions and 1946 deletions
--- a/data/contest.s
+++ b/data/contest.s
@@ -6,11 +6,6 @@
    .section .rodata
    .align 2, 0

-
-	.align 2
-gContestOpponents:: @ 85880A4
-	.include "data/contest_opponents.inc"
-
 gUnknown_085898A4:: @ 85898A4
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02
--- a/data/contest_opponents.inc
+++ b/data/contest_opponents.inc
--- a/data/maps/AbandonedShip_CaptainsOffice/map.json
+++ b/data/maps/AbandonedShip_CaptainsOffice/map.json
@@ -25,7 +25,7 @@
      "trainer_type": "0",
      "trainer_sight_or_berry_tree_id": "0",
      "script": "AbandonedShip_CaptainsOffice_EventScript_2387E2",
-      "flag": "0"
+      "flag": "0" 
    },
    {
      "graphics_id": "EVENT_OBJ_GFX_ITEM_BALL",