diff options
| -rw-r--r-- | battle/effect_command_pointers.asm | 5 | ||||
| -rw-r--r-- | main.asm | 5 | ||||
| -rw-r--r-- | trainers/trainer_pointers.asm | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/battle/effect_command_pointers.asm b/battle/effect_command_pointers.asm index a8f382693..073fe406e 100644 --- a/battle/effect_command_pointers.asm +++ b/battle/effect_command_pointers.asm @@ -1,4 +1,7 @@ -; 3fd28 + + dw $0000 ; padding + +BattleCommandPointers: ; 3fd28 dw BattleCommand01 ; 34084 dw BattleCommand02 ; 343db dw BattleCommand03 ; 34541 @@ -38416,7 +38416,6 @@ Function39990: ; 39990 ret ; 39999 -TrainerGroups: ; 0x39999 INCLUDE "trainers/trainer_pointers.asm" INCLUDE "trainers/trainers.asm" @@ -38426,13 +38425,9 @@ SECTION "bankF", ROMX, BANK[$F] INCLUDE "battle/core.asm" - dw $0000 ; padding - -BattleCommandPointers: ; 3fd28 INCLUDE "battle/effect_command_pointers.asm" - SECTION "bank10", ROMX, BANK[$10] Function40000: ; 40000 diff --git a/trainers/trainer_pointers.asm b/trainers/trainer_pointers.asm index 1872a8194..c0b3d4538 100644 --- a/trainers/trainer_pointers.asm +++ b/trainers/trainer_pointers.asm @@ -1,5 +1,6 @@ ; Each trainer class has its own group. See trainers.asm. +TrainerGroups: ; 0x39999 dw FalknerGroup dw WhitneyGroup dw BugsyGroup |