diff options
| -rw-r--r-- | asm/rom3.s | 2 | ||||
| -rw-r--r-- | data/data2.s | 5 | ||||
| -rw-r--r-- | data/trainer_money.s | 58 |
3 files changed, 61 insertions, 4 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index 05f8f4453..1c17ee7b7 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -52578,7 +52578,7 @@ _080240FE: muls r4, r0 b _08024140 .align 2, 0 -_08024120: .4byte gUnknown_081F98F0 +_08024120: .4byte gTrainerMoney _08024124: .4byte 0x02000000 _08024128: .4byte 0x020239f8 _0802412C: .4byte 0x02025bc4 diff --git a/data/data2.s b/data/data2.s index 126679ab9..e743ac474 100644 --- a/data/data2.s +++ b/data/data2.s @@ -987,9 +987,8 @@ gSpriteAffineAnimTable_81F971C:: @ 81F971C @ 81F9870 .include "data/text/type_names.s" - .align 2 -gUnknown_081F98F0:: @ 81F98F0 - .incbin "baserom.gba", 0x001f98f0, 0xdc +@ 81F98F0 + .include "data/trainer_money.s" @ 81F99CC .include "data/text/ability_descriptions.s" diff --git a/data/trainer_money.s b/data/trainer_money.s new file mode 100644 index 000000000..95da92fea --- /dev/null +++ b/data/trainer_money.s @@ -0,0 +1,58 @@ +@ This is a factor in how much money you get for beating a trainer. + .align 2 +gTrainerMoney:: @ 81F98F0 + .byte TRAINER_CLASS_NAME_TEAM_AQUA, 5, 0, 0 + .byte TRAINER_CLASS_NAME_AQUA_ADMIN, 10, 0, 0 + .byte TRAINER_CLASS_NAME_AQUA_LEADER, 20, 0, 0 + .byte TRAINER_CLASS_NAME_AROMA_LADY, 10, 0, 0 + .byte TRAINER_CLASS_NAME_RUIN_MANIAC, 15, 0, 0 + .byte TRAINER_CLASS_NAME_INTERVIEWER, 12, 0, 0 + .byte TRAINER_CLASS_NAME_TUBER_F, 1, 0, 0 + .byte TRAINER_CLASS_NAME_TUBER_M, 1, 0, 0 + .byte TRAINER_CLASS_NAME_SIS_AND_BRO, 3, 0, 0 + .byte TRAINER_CLASS_NAME_COOL_TRAINER, 12, 0, 0 + .byte TRAINER_CLASS_NAME_HEX_MANIAC, 6, 0, 0 + .byte TRAINER_CLASS_NAME_LADY, 50, 0, 0 + .byte TRAINER_CLASS_NAME_BEAUTY, 20, 0, 0 + .byte TRAINER_CLASS_NAME_RICH_BOY, 50, 0, 0 + .byte TRAINER_CLASS_NAME_POKEMANIAC, 15, 0, 0 + .byte TRAINER_CLASS_NAME_SWIMMER_M, 2, 0, 0 + .byte TRAINER_CLASS_NAME_BLACK_BELT, 8, 0, 0 + .byte TRAINER_CLASS_NAME_GUITARIST, 8, 0, 0 + .byte TRAINER_CLASS_NAME_KINDLER, 8, 0, 0 + .byte TRAINER_CLASS_NAME_CAMPER, 4, 0, 0 + .byte TRAINER_CLASS_NAME_OLD_COUPLE, 10, 0, 0 + .byte TRAINER_CLASS_NAME_BUG_MANIAC, 15, 0, 0 + .byte TRAINER_CLASS_NAME_PSYCHIC, 6, 0, 0 + .byte TRAINER_CLASS_NAME_GENTLEMAN, 20, 0, 0 + .byte TRAINER_CLASS_NAME_ELITE_FOUR, 25, 0, 0 + .byte TRAINER_CLASS_NAME_LEADER, 25, 0, 0 + .byte TRAINER_CLASS_NAME_SCHOOL_KID, 5, 0, 0 + .byte TRAINER_CLASS_NAME_SR_AND_JR, 4, 0, 0 + .byte TRAINER_CLASS_NAME_POKEFAN, 20, 0, 0 + .byte TRAINER_CLASS_NAME_EXPERT, 10, 0, 0 + .byte TRAINER_CLASS_NAME_YOUNGSTER, 4, 0, 0 + .byte TRAINER_CLASS_NAME_CHAMPION, 50, 0, 0 + .byte TRAINER_CLASS_NAME_FISHERMAN, 10, 0, 0 + .byte TRAINER_CLASS_NAME_TRIATHLETE, 10, 0, 0 + .byte TRAINER_CLASS_NAME_DRAGON_TAMER, 12, 0, 0 + .byte TRAINER_CLASS_NAME_BIRD_KEEPER, 8, 0, 0 + .byte TRAINER_CLASS_NAME_NINJA_BOY, 3, 0, 0 + .byte TRAINER_CLASS_NAME_BATTLE_GIRL, 6, 0, 0 + .byte TRAINER_CLASS_NAME_PARASOL_LADY, 10, 0, 0 + .byte TRAINER_CLASS_NAME_SWIMMER_F, 2, 0, 0 + .byte TRAINER_CLASS_NAME_PICNICKER, 4, 0, 0 + .byte TRAINER_CLASS_NAME_TWINS, 3, 0, 0 + .byte TRAINER_CLASS_NAME_SAILOR, 8, 0, 0 + .byte TRAINER_CLASS_NAME_COLLECTOR, 15, 0, 0 + .byte TRAINER_CLASS_NAME_POKEMON_TRAINER_3, 15, 0, 0 + .byte TRAINER_CLASS_NAME_POKEMON_BREEDER, 10, 0, 0 + .byte TRAINER_CLASS_NAME_POKEMON_RANGER, 12, 0, 0 + .byte TRAINER_CLASS_NAME_TEAM_MAGMA, 5, 0, 0 + .byte TRAINER_CLASS_NAME_MAGMA_ADMIN, 10, 0, 0 + .byte TRAINER_CLASS_NAME_MAGMA_LEADER, 20, 0, 0 + .byte TRAINER_CLASS_NAME_LASS, 4, 0, 0 + .byte TRAINER_CLASS_NAME_BUG_CATCHER, 4, 0, 0 + .byte TRAINER_CLASS_NAME_HIKER, 10, 0, 0 + .byte TRAINER_CLASS_NAME_YOUNG_COUPLE, 8, 0, 0 + .byte -1, 5, 0, 0 |