summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/calculate_base_damage.s2
-rw-r--r--asm/rom3.s30
-rw-r--r--asm/rom6.s6
-rw-r--r--asm/rom_803D1FC.s4
-rw-r--r--asm/rom_807C828.s82
-rw-r--r--asm/rom_80B5054.s4
-rw-r--r--asm/rom_81258BC.s4
-rw-r--r--data/data2.s89
-rw-r--r--src/pokemon_2.c4
-rw-r--r--sym_ewram.txt18
10 files changed, 145 insertions, 98 deletions
diff --git a/asm/calculate_base_damage.s b/asm/calculate_base_damage.s
index 06d2871bd..2559b99fb 100644
--- a/asm/calculate_base_damage.s
+++ b/asm/calculate_base_damage.s
@@ -332,7 +332,7 @@ _0803BC9E:
.align 2, 0
_0803BCB8: .4byte gUnknown_020239F8
_0803BCBC: .4byte 0x00000902
-_0803BCC0: .4byte word_202FF5E
+_0803BCC0: .4byte gTrainerBattleOpponent
_0803BCC4: .4byte 0x00000807
_0803BCC8: .4byte 0x0000080b
_0803BCCC: .4byte 0x0000080d
diff --git a/asm/rom3.s b/asm/rom3.s
index c00ae23e2..63e8b256b 100644
--- a/asm/rom3.s
+++ b/asm/rom3.s
@@ -4260,7 +4260,7 @@ _0800D860:
b _0800DA66
.align 2, 0
_0800D890: .4byte gTrainers
-_0800D894: .4byte word_202FF5E
+_0800D894: .4byte gTrainerBattleOpponent
_0800D898: .4byte gBattleTerrainTiles_Building
_0800D89C: .4byte 0x06008000
_0800D8A0: .4byte gBattleTerrainTilemap_Building
@@ -5519,7 +5519,7 @@ _0800E348:
b _0800E3D2
.align 2, 0
_0800E370: .4byte gTrainers
-_0800E374: .4byte word_202FF5E
+_0800E374: .4byte gTrainerBattleOpponent
_0800E378: .4byte gBattleTerrainAnimTiles_Building
_0800E37C: .4byte 0x06004000
_0800E380: .4byte gBattleTerrainAnimTilemap_Building
@@ -5689,7 +5689,7 @@ _0800E4C0:
b _0800E57E
.align 2, 0
_0800E4E4: .4byte gTrainers
-_0800E4E8: .4byte word_202FF5E
+_0800E4E8: .4byte gTrainerBattleOpponent
_0800E4EC: .4byte gBattleTerrainTiles_Stadium
_0800E4F0:
bl sav1_map_get_battletype
@@ -5820,7 +5820,7 @@ _0800E5CC:
b _0800E68A
.align 2, 0
_0800E5F0: .4byte gTrainers
-_0800E5F4: .4byte word_202FF5E
+_0800E5F4: .4byte gTrainerBattleOpponent
_0800E5F8: .4byte gBattleTerrainTilemap_Stadium
_0800E5FC:
bl sav1_map_get_battletype
@@ -5950,7 +5950,7 @@ _0800E6D8:
b _0800E7A6
.align 2, 0
_0800E6F8: .4byte gTrainers
-_0800E6FC: .4byte word_202FF5E
+_0800E6FC: .4byte gTrainerBattleOpponent
_0800E700: .4byte gBattleTerrainPalette_BuildingLeader
_0800E704:
cmp r0, 0x20
@@ -6274,7 +6274,7 @@ _0800E9AE:
_0800E9CC: .4byte sub_800EC9C
_0800E9D0: .4byte gUnknown_020239F8
_0800E9D4: .4byte gEnemyParty
-_0800E9D8: .4byte word_202FF5E
+_0800E9D8: .4byte gTrainerBattleOpponent
_0800E9DC: .4byte gMain
_0800E9E0: .4byte 0x0000043d
_0800E9E4: .4byte gPlayerParty
@@ -7041,7 +7041,7 @@ _0800F018: .4byte gMain
_0800F01C: .4byte sub_8010824
_0800F020: .4byte sub_800F808
_0800F024: .4byte gUnknown_020239F8
-_0800F028: .4byte word_202FF5E
+_0800F028: .4byte gTrainerBattleOpponent
thumb_func_end sub_800EC9C
thumb_func_start sub_800F02C
@@ -8019,7 +8019,7 @@ _0800F7F4: .4byte gMain
_0800F7F8: .4byte sub_8010824
_0800F7FC: .4byte sub_800F808
_0800F800: .4byte gUnknown_020239F8
-_0800F804: .4byte word_202FF5E
+_0800F804: .4byte gTrainerBattleOpponent
thumb_func_end sub_800F298
thumb_func_start sub_800F808
@@ -16256,7 +16256,7 @@ _08013A30:
_08013A3C: .4byte gUnknown_02024C10
_08013A40: .4byte gUnknown_081D8DBE
_08013A44: .4byte gTrainers
-_08013A48: .4byte word_202FF5E
+_08013A48: .4byte gTrainerBattleOpponent
_08013A4C: .4byte _08013A50
.align 2, 0
_08013A50:
@@ -38593,7 +38593,7 @@ _0801F214:
_0801F254: .4byte gUnknown_02024C07
_0801F258: .4byte gUnknown_020239F8
_0801F25C: .4byte 0x00000902
-_0801F260: .4byte word_202FF5E
+_0801F260: .4byte gTrainerBattleOpponent
_0801F264: .4byte gUnknown_02024DBC
_0801F268: .4byte gBitTable
_0801F26C: .4byte gUnknown_02024A6A
@@ -48228,7 +48228,7 @@ sub_8024014: @ 8024014
mov r8, r0
b _08024140
.align 2, 0
-_08024048: .4byte word_202FF5E
+_08024048: .4byte gTrainerBattleOpponent
_0802404C: .4byte 0x02017000
_08024050: .4byte 0xfffff056
_08024054: .4byte gSaveBlock1 + 0x490
@@ -48347,7 +48347,7 @@ _08024124: .4byte 0x02000000
_08024128: .4byte gUnknown_020239F8
_0802412C: .4byte gSaveBlock1 + 0x490
_08024130: .4byte gTrainers
-_08024134: .4byte word_202FF5E
+_08024134: .4byte gTrainerBattleOpponent
_08024138: .4byte 0x00016056
_0802413C:
adds r4, r3, 0
@@ -60663,7 +60663,7 @@ _0802A2EE:
_0802A30C: .4byte gUnknown_02024C07
_0802A310: .4byte gUnknown_020239F8
_0802A314: .4byte 0x00000902
-_0802A318: .4byte word_202FF5E
+_0802A318: .4byte gTrainerBattleOpponent
_0802A31C: .4byte gUnknown_02024DBC
_0802A320: .4byte gBitTable
_0802A324: .4byte gUnknown_02024A6A
@@ -81385,7 +81385,7 @@ c2_8123744: @ 8034BFC
bl GetSecretBaseTrainerPicIndex
b _08034C42
.align 2, 0
-_08034C18: .4byte word_202FF5E
+_08034C18: .4byte gTrainerBattleOpponent
_08034C1C:
ldr r0, _08034C30
ldrh r1, [r0]
@@ -81596,7 +81596,7 @@ sub_8034DC0: @ 8034DC0
bl GetSecretBaseTrainerPicIndex
b _08034E06
.align 2, 0
-_08034DDC: .4byte word_202FF5E
+_08034DDC: .4byte gTrainerBattleOpponent
_08034DE0:
ldr r0, _08034DF4
ldrh r1, [r0]
diff --git a/asm/rom6.s b/asm/rom6.s
index b33b2d436..3258bd26c 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -43594,7 +43594,7 @@ _08120D40:
ldr r6, _08120D50
b _08120F70
.align 2, 0
-_08120D44: .4byte word_202FF5E
+_08120D44: .4byte gTrainerBattleOpponent
_08120D48: .4byte gUnknown_020239F8
_08120D4C: .4byte gUnknown_08400771
_08120D50: .4byte gUnknown_08400781
@@ -44803,7 +44803,7 @@ _0812174C:
movs r1, 0xD
b _081217AE
.align 2, 0
-_08121764: .4byte word_202FF5E
+_08121764: .4byte gTrainerBattleOpponent
_08121768:
ldr r0, _08121784
ldrh r1, [r0]
@@ -44865,7 +44865,7 @@ _081217C0:
mov r4, sp
b _081219E6
.align 2, 0
-_081217E4: .4byte word_202FF5E
+_081217E4: .4byte gTrainerBattleOpponent
_081217E8: .4byte 0x02017002
_081217EC:
ldr r0, _08121804
diff --git a/asm/rom_803D1FC.s b/asm/rom_803D1FC.s
index b5535b384..c400fd6f9 100644
--- a/asm/rom_803D1FC.s
+++ b/asm/rom_803D1FC.s
@@ -3791,7 +3791,7 @@ _0803FE56:
.align 2, 0
_0803FE60: .4byte gUnknown_020239F8
_0803FE64: .4byte gTrainers
-_0803FE68: .4byte word_202FF5E
+_0803FE68: .4byte gTrainerBattleOpponent
_0803FE6C: .4byte gUnknown_082082FE
thumb_func_end sub_803FCD4
@@ -5027,7 +5027,7 @@ _08040780:
mov pc, r0
.align 2, 0
_0804078C: .4byte gTrainers
-_08040790: .4byte word_202FF5E
+_08040790: .4byte gTrainerBattleOpponent
_08040794: .4byte _08040798
.align 2, 0
_08040798:
diff --git a/asm/rom_807C828.s b/asm/rom_807C828.s
index 8827e6b8f..7bfd06c19 100644
--- a/asm/rom_807C828.s
+++ b/asm/rom_807C828.s
@@ -11471,7 +11471,7 @@ sub_8082034: @ 8082034
b _08082070
.align 2, 0
_08082064: .4byte gEnemyParty
-_08082068: .4byte gUnknown_0839ACF8
+_08082068: .4byte gBattleTransitionTable_Wild
_0808206C:
ldr r0, _0808207C
lsls r1, r5, 1
@@ -11482,7 +11482,7 @@ _08082070:
pop {r1}
bx r1
.align 2, 0
-_0808207C: .4byte gUnknown_0839ACF8
+_0808207C: .4byte gBattleTransitionTable_Wild
thumb_func_end sub_8082034
thumb_func_start sub_8082080
@@ -11510,7 +11510,7 @@ sub_8082080: @ 8082080
movs r0, 0xC
b _0808212C
.align 2, 0
-_080820AC: .4byte word_202FF5E
+_080820AC: .4byte gTrainerBattleOpponent
_080820B0: .4byte gTrainers
_080820B4: .4byte 0x00000105
_080820B8:
@@ -11568,7 +11568,7 @@ _080820F2:
adds r0, 0x1
b _08082128
.align 2, 0
-_08082120: .4byte gUnknown_0839AD00
+_08082120: .4byte gBattleTransitionTable_Trainer
_08082124:
ldr r0, _08082134
lsls r1, r6, 1
@@ -11580,7 +11580,7 @@ _0808212C:
pop {r1}
bx r1
.align 2, 0
-_08082134: .4byte gUnknown_0839AD00
+_08082134: .4byte gBattleTransitionTable_Trainer
thumb_func_end sub_8082080
thumb_func_start sub_8082138
@@ -11751,7 +11751,7 @@ trainerflag_opponent: @ 8082264
lsrs r0, 16
bx lr
.align 2, 0
-_08082278: .4byte word_202FF5E
+_08082278: .4byte gTrainerBattleOpponent
thumb_func_end trainerflag_opponent
thumb_func_start battle_exit_is_player_defeat
@@ -11810,15 +11810,15 @@ sub_80822BC: @ 80822BC
str r1, [r0]
bx lr
.align 2, 0
-_080822E8: .4byte gUnknown_0202FF5C
-_080822EC: .4byte word_202FF5E
-_080822F0: .4byte gUnknown_0202FF60
-_080822F4: .4byte gUnknown_0202FF64
-_080822F8: .4byte gUnknown_0202FF68
-_080822FC: .4byte gUnknown_0202FF6C
-_08082300: .4byte gUnknown_0202FF70
-_08082304: .4byte gUnknown_0202FF74
-_08082308: .4byte gUnknown_0202FF78
+_080822E8: .4byte gTrainerBattleMode
+_080822EC: .4byte gTrainerBattleOpponent
+_080822F0: .4byte gTrainerMapObjectLocalId
+_080822F4: .4byte gTrainerIntroSpeech
+_080822F8: .4byte gTrainerDefeatSpeech
+_080822FC: .4byte gTrainerVictorySpeech
+_08082300: .4byte gTrainerCannotBattleSpeech
+_08082304: .4byte gTrainerBattleScriptReturnAddress
+_08082308: .4byte gTrainerBattleEndScript
thumb_func_end sub_80822BC
thumb_func_start TrainerBattleLoadArgs
@@ -11913,7 +11913,7 @@ _080823B4:
pop {r0}
bx r0
.align 2, 0
-_080823B8: .4byte gUnknown_0202FF60
+_080823B8: .4byte gTrainerMapObjectLocalId
_080823BC: .4byte gUnknown_0202E8DE
_080823C0: .4byte gSaveBlock1
_080823C4: .4byte gSelectedMapObject
@@ -11940,7 +11940,7 @@ sub_80823C8: @ 80823C8
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_080823F0: .4byte gUnknown_0202FF5C
+_080823F0: .4byte gTrainerBattleMode
_080823F4: .4byte _080823F8
.align 2, 0
_080823F8:
@@ -11959,18 +11959,18 @@ _08082418:
ldr r0, _08082428
b _080824B2
.align 2, 0
-_08082424: .4byte gUnknown_0839ADE0
+_08082424: .4byte gTrainerBattleSpecs_3
_08082428: .4byte gUnknown_0819F878
_0808242C:
ldr r0, _08082430
b _0808243E
.align 2, 0
-_08082430: .4byte gUnknown_0839AD98
+_08082430: .4byte gTrainerBattleSpecs_2
_08082434:
ldr r0, _08082438
b _080824A6
.align 2, 0
-_08082438: .4byte gUnknown_0839AD50
+_08082438: .4byte gTrainerBattleSpecs_1
_0808243C:
ldr r0, _0808244C
_0808243E:
@@ -11980,7 +11980,7 @@ _0808243E:
ldr r0, _08082450
b _080824B2
.align 2, 0
-_0808244C: .4byte gUnknown_0839AE28
+_0808244C: .4byte gTrainerBattleSpecs_4
_08082450: .4byte gUnknown_0819F840
_08082454:
ldr r0, _08082470
@@ -11994,8 +11994,8 @@ _08082454:
ldr r0, _08082478
b _080824B2
.align 2, 0
-_08082470: .4byte gUnknown_0839AD98
-_08082474: .4byte word_202FF5E
+_08082470: .4byte gTrainerBattleSpecs_2
+_08082474: .4byte gTrainerBattleOpponent
_08082478: .4byte gUnknown_0819F8AE
_0808247C:
ldr r0, _08082498
@@ -12009,8 +12009,8 @@ _0808247C:
ldr r0, _080824A0
b _080824B2
.align 2, 0
-_08082498: .4byte gUnknown_0839AD08
-_0808249C: .4byte word_202FF5E
+_08082498: .4byte gTrainerBattleSpecs_0
+_0808249C: .4byte gTrainerBattleOpponent
_080824A0: .4byte gUnknown_0819F887
_080824A4:
ldr r0, _080824B8
@@ -12024,7 +12024,7 @@ _080824B2:
pop {r1}
bx r1
.align 2, 0
-_080824B8: .4byte gUnknown_0839AD08
+_080824B8: .4byte gTrainerBattleSpecs_0
_080824BC: .4byte gUnknown_0819F818
thumb_func_end sub_80823C8
@@ -12109,7 +12109,7 @@ sub_8082558: @ 8082558
ldrb r0, [r0]
bx lr
.align 2, 0
-_08082560: .4byte gUnknown_0202FF5C
+_08082560: .4byte gTrainerBattleMode
thumb_func_end sub_8082558
thumb_func_start sub_8082564
@@ -12220,7 +12220,7 @@ sub_808260C: @ 808260C
bl SetMainCallback2
b _08082652
.align 2, 0
-_08082624: .4byte word_202FF5E
+_08082624: .4byte gTrainerBattleOpponent
_08082628: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_0808262C:
ldr r0, _08082640
@@ -12258,7 +12258,7 @@ do_choose_name_or_words_screen: @ 808265C
bl SetMainCallback2
b _080826A6
.align 2, 0
-_08082674: .4byte word_202FF5E
+_08082674: .4byte gTrainerBattleOpponent
_08082678: .4byte c2_exit_to_overworld_1_continue_scripts_restart_music
_0808267C:
ldr r0, _08082690
@@ -12324,7 +12324,7 @@ _080826F4:
pop {r1}
bx r1
.align 2, 0
-_080826F8: .4byte gUnknown_0202FF74
+_080826F8: .4byte gTrainerBattleScriptReturnAddress
_080826FC: .4byte gUnknown_081C6C02
thumb_func_end sub_80826E8
@@ -12340,7 +12340,7 @@ _0808270C:
pop {r1}
bx r1
.align 2, 0
-_08082710: .4byte gUnknown_0202FF78
+_08082710: .4byte gTrainerBattleEndScript
_08082714: .4byte gUnknown_081C6C02
thumb_func_end sub_8082700
@@ -12375,8 +12375,8 @@ sub_8082728: @ 8082728
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_08082750: .4byte gUnknown_0202FF5C
-_08082754: .4byte word_202FF5E
+_08082750: .4byte gTrainerBattleMode
+_08082754: .4byte gTrainerBattleOpponent
_08082758: .4byte _0808275C
.align 2, 0
_0808275C:
@@ -12489,7 +12489,7 @@ sub_808281C: @ 808281C
pop {r1}
bx r1
.align 2, 0
-_0808282C: .4byte gUnknown_0202FF64
+_0808282C: .4byte gTrainerIntroSpeech
thumb_func_end sub_808281C
thumb_func_start sub_8082830
@@ -12504,7 +12504,7 @@ sub_8082830: @ 8082830
bl sub_80BCCE8
b _0808284C
.align 2, 0
-_08082844: .4byte word_202FF5E
+_08082844: .4byte gTrainerBattleOpponent
_08082848:
ldr r0, _08082864
ldr r0, [r0]
@@ -12519,7 +12519,7 @@ _0808284C:
pop {r1}
bx r1
.align 2, 0
-_08082864: .4byte gUnknown_0202FF68
+_08082864: .4byte gTrainerDefeatSpeech
_08082868: .4byte gStringVar4
thumb_func_end sub_8082830
@@ -12532,7 +12532,7 @@ unref_sub_808286C: @ 808286C
pop {r1}
bx r1
.align 2, 0
-_0808287C: .4byte gUnknown_0202FF6C
+_0808287C: .4byte gTrainerVictorySpeech
thumb_func_end unref_sub_808286C
thumb_func_start sub_8082880
@@ -12544,7 +12544,7 @@ sub_8082880: @ 8082880
pop {r1}
bx r1
.align 2, 0
-_08082890: .4byte gUnknown_0202FF70
+_08082890: .4byte gTrainerCannotBattleSpeech
thumb_func_end sub_8082880
thumb_func_start sub_8082894
@@ -13126,7 +13126,7 @@ sub_8082C68: @ 8082C68
b _08082C96
.align 2, 0
_08082C8C: .4byte gTrainerEyeTrainers
-_08082C90: .4byte word_202FF5E
+_08082C90: .4byte gTrainerBattleOpponent
_08082C94:
movs r0, 0x1
_08082C96:
@@ -13148,7 +13148,7 @@ sub_8082C9C: @ 8082C9C
bx r1
.align 2, 0
_08082CB0: .4byte gTrainerEyeTrainers
-_08082CB4: .4byte word_202FF5E
+_08082CB4: .4byte gTrainerBattleOpponent
thumb_func_end sub_8082C9C
thumb_func_start sub_8082CB8
@@ -13163,7 +13163,7 @@ sub_8082CB8: @ 8082CB8
bx r0
.align 2, 0
_08082CCC: .4byte gTrainerEyeTrainers
-_08082CD0: .4byte word_202FF5E
+_08082CD0: .4byte gTrainerBattleOpponent
thumb_func_end sub_8082CB8
thumb_func_start sub_8082CD4
diff --git a/asm/rom_80B5054.s b/asm/rom_80B5054.s
index d296b1001..98ecb8692 100644
--- a/asm/rom_80B5054.s
+++ b/asm/rom_80B5054.s
@@ -169611,7 +169611,7 @@ _08107138:
.align 2, 0
_08107144: .4byte 0x02016a00
_08107148: .4byte gUnknown_020239F8
-_0810714C: .4byte word_202FF5E
+_0810714C: .4byte gTrainerBattleOpponent
_08107150: .4byte 0x00000982
_08107154: .4byte gTrainers + 0x10
_08107158: .4byte 0x02016a2c
@@ -169777,7 +169777,7 @@ _08107296:
.align 2, 0
_0810729C: .4byte 0x02016800
_081072A0: .4byte gTrainers
-_081072A4: .4byte word_202FF5E
+_081072A4: .4byte gTrainerBattleOpponent
thumb_func_end sub_810715C
thumb_func_start sub_81072A8
diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s
index dd6e3a491..67ecdf95f 100644
--- a/asm/rom_81258BC.s
+++ b/asm/rom_81258BC.s
@@ -21512,7 +21512,7 @@ _0813558E:
b _081355D6
.align 2, 0
_081355A4: .4byte gUnknown_020239F8
-_081355A8: .4byte word_202FF5E
+_081355A8: .4byte gTrainerBattleOpponent
_081355AC:
movs r5, 0
_081355AE:
@@ -21591,7 +21591,7 @@ _08135650: .4byte gEnemyParty
_08135654: .4byte gSaveBlock2 + 0x4CC
_08135658: .4byte gUnknown_020239F8
_0813565C: .4byte 0x00000808
-_08135660: .4byte word_202FF5E
+_08135660: .4byte gTrainerBattleOpponent
_08135664: .4byte sub_8135534
thumb_func_end sub_813556C
diff --git a/data/data2.s b/data/data2.s
index a9b66e062..379232662 100644
--- a/data/data2.s
+++ b/data/data2.s
@@ -10939,28 +10939,75 @@ gUnknown_0839ACE8:: @ 839ACE8
.align 2
gUnknown_0839ACEC:: @ 839ACEC
- .incbin "baserom.gba", 0x0039acec, 0xc
-
-gUnknown_0839ACF8:: @ 839ACF8
- .incbin "baserom.gba", 0x0039acf8, 0x8
-
-gUnknown_0839AD00:: @ 839AD00
- .incbin "baserom.gba", 0x0039ad00, 0x8
-
-gUnknown_0839AD08:: @ 839AD08
- .incbin "baserom.gba", 0x0039ad08, 0x48
-
-gUnknown_0839AD50:: @ 839AD50
- .incbin "baserom.gba", 0x0039ad50, 0x48
-
-gUnknown_0839AD98:: @ 839AD98
- .incbin "baserom.gba", 0x0039ad98, 0x48
-
-gUnknown_0839ADE0:: @ 839ADE0
- .incbin "baserom.gba", 0x0039ade0, 0x48
+ .4byte REG_WIN0H
+ .4byte ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1
+ .4byte 1
-gUnknown_0839AE28:: @ 839AE28
- .incbin "baserom.gba", 0x0039ae28, 0x48
+gBattleTransitionTable_Wild:: @ 839ACF8
+ .byte 8, 9, 5, 10, 0, 10, 7, 6
+
+gBattleTransitionTable_Trainer:: @ 839AD00
+ .byte 4, 11, 2, 3, 0, 10, 1, 6
+
+ .align 2
+gTrainerBattleSpecs_0:: @ 839AD08
+ .4byte gTrainerBattleMode, 0
+ .4byte gTrainerBattleOpponent, 1
+ .4byte gTrainerMapObjectLocalId, 1
+ .4byte gTrainerIntroSpeech, 2
+ .4byte gTrainerDefeatSpeech, 2
+ .4byte gTrainerVictorySpeech, 5
+ .4byte gTrainerCannotBattleSpeech, 5
+ .4byte gTrainerBattleEndScript, 5
+ .4byte gTrainerBattleScriptReturnAddress, 6
+
+ .align 2
+gTrainerBattleSpecs_1:: @ 839AD50
+ .4byte gTrainerBattleMode, 0
+ .4byte gTrainerBattleOpponent, 1
+ .4byte gTrainerMapObjectLocalId, 1
+ .4byte gTrainerIntroSpeech, 2
+ .4byte gTrainerDefeatSpeech, 2
+ .4byte gTrainerVictorySpeech, 5
+ .4byte gTrainerCannotBattleSpeech, 5
+ .4byte gTrainerBattleEndScript, 2
+ .4byte gTrainerBattleScriptReturnAddress, 6
+
+ .align 2
+gTrainerBattleSpecs_2:: @ 839AD98
+ .4byte gTrainerBattleMode, 0
+ .4byte gTrainerBattleOpponent, 1
+ .4byte gTrainerMapObjectLocalId, 1
+ .4byte gTrainerIntroSpeech, 2
+ .4byte gTrainerDefeatSpeech, 2
+ .4byte gTrainerVictorySpeech, 5
+ .4byte gTrainerCannotBattleSpeech, 2
+ .4byte gTrainerBattleEndScript, 5
+ .4byte gTrainerBattleScriptReturnAddress, 6
+
+ .align 2
+gTrainerBattleSpecs_3:: @ 839ADE0
+ .4byte gTrainerBattleMode, 0
+ .4byte gTrainerBattleOpponent, 1
+ .4byte gTrainerMapObjectLocalId, 1
+ .4byte gTrainerIntroSpeech, 5
+ .4byte gTrainerDefeatSpeech, 2
+ .4byte gTrainerVictorySpeech, 5
+ .4byte gTrainerCannotBattleSpeech, 5
+ .4byte gTrainerBattleEndScript, 5
+ .4byte gTrainerBattleScriptReturnAddress, 6
+
+ .align 2
+gTrainerBattleSpecs_4:: @ 839AE28
+ .4byte gTrainerBattleMode, 0
+ .4byte gTrainerBattleOpponent, 1
+ .4byte gTrainerMapObjectLocalId, 1
+ .4byte gTrainerIntroSpeech, 2
+ .4byte gTrainerDefeatSpeech, 2
+ .4byte gTrainerVictorySpeech, 5
+ .4byte gTrainerCannotBattleSpeech, 2
+ .4byte gTrainerBattleEndScript, 2
+ .4byte gTrainerBattleScriptReturnAddress, 6
@ 839AE70
.include "data/trainer_eye_trainers.s"
diff --git a/src/pokemon_2.c b/src/pokemon_2.c
index 384e04545..11bd20f4c 100644
--- a/src/pokemon_2.c
+++ b/src/pokemon_2.c
@@ -28,7 +28,7 @@ extern u16 word_2024DB8;
extern struct EnigmaBerry gEnigmaBerries[];
extern u16 gBattleMovePower;
extern struct SpriteTemplate gUnknown_02024E8C;
-extern u16 word_202FF5E;
+extern u16 gTrainerBattleOpponent;
extern struct PokemonStorage gPokemonStorage;
extern u8 gBadEggNickname[];
@@ -1117,7 +1117,7 @@ void CreateSecretBaseEnemyParty(struct SecretBaseRecord *secretBaseRecord)
}
gUnknown_020239F8 = 8;
- word_202FF5E = 1024;
+ gTrainerBattleOpponent = 1024;
}
u8 GetSecretBaseTrainerPicIndex(void)
diff --git a/sym_ewram.txt b/sym_ewram.txt
index 2dafbcee5..0be152dcf 100644
--- a/sym_ewram.txt
+++ b/sym_ewram.txt
@@ -563,31 +563,31 @@ gUnknown_0202FF38: @ 202FF38
gUnknown_0202FF58: @ 202FF58
.space 0x4
-gUnknown_0202FF5C: @ 202FF5C
+gTrainerBattleMode: @ 202FF5C
.space 0x2
-word_202FF5E: @ 202FF5E
+gTrainerBattleOpponent: @ 202FF5E
.space 0x2
-gUnknown_0202FF60: @ 202FF60
+gTrainerMapObjectLocalId: @ 202FF60
.space 0x4
-gUnknown_0202FF64: @ 202FF64
+gTrainerIntroSpeech: @ 202FF64
.space 0x4
-gUnknown_0202FF68: @ 202FF68
+gTrainerDefeatSpeech: @ 202FF68
.space 0x4
-gUnknown_0202FF6C: @ 202FF6C
+gTrainerVictorySpeech: @ 202FF6C
.space 0x4
-gUnknown_0202FF70: @ 202FF70
+gTrainerCannotBattleSpeech: @ 202FF70
.space 0x4
-gUnknown_0202FF74: @ 202FF74
+gTrainerBattleScriptReturnAddress: @ 202FF74
.space 0x4
-gUnknown_0202FF78: @ 202FF78
+gTrainerBattleEndScript: @ 202FF78
.space 0x4
gWildEncountersDisabled: @ 202FF7C
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-12 21:55:58 +0000