diff options
| -rw-r--r-- | data/pokenav.s | 16 | ||||
| -rw-r--r-- | ld_script.txt | 1 | ||||
| -rw-r--r-- | src/trainers_eye.c | 24 |
3 files changed, 21 insertions, 20 deletions
diff --git a/data/pokenav.s b/data/pokenav.s index 4361e2f14..15c5ee534 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -1144,19 +1144,3 @@ gUnknown_083E499C:: @ 83E499C .2byte 0x4C .2byte 0x4D .2byte 0x4E - - .align 2 -gUnknown_083E49C0:: @ 83E49C0 - .2byte 0x109, 0xA - .2byte 0x10A, 0x2 - .2byte 0x10B, 0x9 - .2byte 0x10C, 0x3 - .2byte 0x10D, 0x7 - .2byte 0x10E, 0xB - .2byte 0x10F, 0xD - .2byte 0x110, 0xE - .2byte 0x105, 0xF - .2byte 0x106, 0xF - .2byte 0x107, 0xF - .2byte 0x108, 0xF - .2byte 0x14F, 0xF diff --git a/ld_script.txt b/ld_script.txt index d48644e18..e6e195479 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -701,6 +701,7 @@ SECTIONS { src/easy_chat_2.o(.data); src/pokenav.o(.rodata); data/pokenav.o(.rodata); + src/trainers_eye.o(.rodata); src/mon_markings.o(.rodata); src/mauville_man.o(.rodata); src/mail.o(.rodata); diff --git a/src/trainers_eye.c b/src/trainers_eye.c index a1f61a61d..3b6ccf08a 100644 --- a/src/trainers_eye.c +++ b/src/trainers_eye.c @@ -2,6 +2,8 @@ #include "battle_setup.h" #include "overworld.h" #include "pokenav.h" +#include "constants/opponents.h" +#include "constants/region_map_sections.h" struct TrainersEyeGymLeadersAndE4 { @@ -9,7 +11,21 @@ struct TrainersEyeGymLeadersAndE4 u16 regionMapSectionId; }; -extern const struct TrainersEyeGymLeadersAndE4 gUnknown_083E49C0[13]; +static const struct TrainersEyeGymLeadersAndE4 sGymLeaderTrainersEye[13] = { + {TRAINER_ROXANNE, MAPSEC_RUSTBORO_CITY}, + {TRAINER_BRAWLY, MAPSEC_DEWFORD_TOWN}, + {TRAINER_WATTSON, MAPSEC_MAUVILLE_CITY}, + {TRAINER_FLANNERY, MAPSEC_LAVARIDGE_TOWN}, + {TRAINER_NORMAN, MAPSEC_PETALBURG_CITY}, + {TRAINER_WINONA, MAPSEC_FORTREE_CITY}, + {TRAINER_TATE_AND_LIZA, MAPSEC_MOSSDEEP_CITY}, + {TRAINER_WALLACE, MAPSEC_SOOTOPOLIS_CITY}, + {TRAINER_SIDNEY, MAPSEC_EVER_GRANDE_CITY}, + {TRAINER_PHOEBE, MAPSEC_EVER_GRANDE_CITY}, + {TRAINER_GLACIA, MAPSEC_EVER_GRANDE_CITY}, + {TRAINER_DRAKE, MAPSEC_EVER_GRANDE_CITY}, + {TRAINER_STEVEN, MAPSEC_EVER_GRANDE_CITY} +}; void sub_80F6C20(void) { @@ -32,10 +48,10 @@ void sub_80F6C20(void) for (i = 0; i < 13; i++) { { - if (HasTrainerAlreadyBeenFought(gUnknown_083E49C0[i].opponentId)) + if (HasTrainerAlreadyBeenFought(sGymLeaderTrainersEye[i].opponentId)) { - gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk0 = gUnknown_083E49C0[i].opponentId; - gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk2 = gUnknown_083E49C0[i].regionMapSectionId; + gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk0 = sGymLeaderTrainersEye[i].opponentId; + gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk2 = sGymLeaderTrainersEye[i].regionMapSectionId; gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk5 = 0; gUnknown_083DFEC4->unkCEE8[gUnknown_083DFEC4->unkD158].unk4 = i + 0x38; gUnknown_083DFEC4->unkD158++; |