dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into slot_machine

Browse Source
This commit is contained in:
PikalaxALT
2019-07-29 21:10:54 -04:00
parent ef4c86fbfd d4cc0e161b
commit e130a00cdf
2917 changed files with 162856 additions and 112104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/buy_menu_helpers.s
-14
View File
@@ -1,14 +0,0 @@
.section .rodata
.align 2
gUnknown_8464804:: @ 8464804
.incbin "baserom.gba", 0x464804, 0x38
gUnknown_846483C:: @ 846483C
.incbin "baserom.gba", 0x46483C, 0x40
gUnknown_846487C:: @ 846487C
.incbin "baserom.gba", 0x46487C, 0x8
gUnknown_8464884:: @ 8464884
.incbin "baserom.gba", 0x464884, 0xC
data/data.s
+56 -247
View File
@@ -68,7 +68,52 @@ gUnknown_8234690:: @ 8234690
.incbin "baserom.gba", 0x234690, 0x4
gUnknown_8234694:: @ 8234694
.incbin "baserom.gba", 0x234694, 0x328
.incbin "baserom.gba", 0x234694, 0x4
gUnknown_8234698:: @ 8234698
.incbin "baserom.gba", 0x234698, 0x20
gUnknown_82346B8:: @ 82346B8
.incbin "baserom.gba", 0x2346B8, 0x20
gUnknown_82346D8:: @ 82346D8
.incbin "baserom.gba", 0x2346D8, 0x20
gUnknown_82346F8:: @ 82346F8
.incbin "baserom.gba", 0x2346F8, 0x20
gUnknown_8234718:: @ 8234718
.incbin "baserom.gba", 0x234718, 0x28
gUnknown_8234740:: @ 8234740
.incbin "baserom.gba", 0x234740, 0x28
gUnknown_8234768:: @ 8234768
.incbin "baserom.gba", 0x234768, 0x20
gUnknown_8234788:: @ 8234788
.incbin "baserom.gba", 0x234788, 0x20
gUnknown_82347A8:: @ 82347A8
.incbin "baserom.gba", 0x2347A8, 0x20
gUnknown_82347C8:: @ 82347C8
.incbin "baserom.gba", 0x2347C8, 0x20
gUnknown_82347E8:: @ 82347E8
.incbin "baserom.gba", 0x2347E8, 0xE0
gUnknown_82348C8:: @ 82348C8
.incbin "baserom.gba", 0x2348C8, 0x24
gUnknown_82348EC:: @ 82348EC
.incbin "baserom.gba", 0x2348EC, 0x58
gUnknown_8234944:: @ 8234944
.incbin "baserom.gba", 0x234944, 0x58
gUnknown_823499C:: @ 823499C
.incbin "baserom.gba", 0x23499C, 0x20
gUnknown_82349BC:: @ 82349BC
.incbin "baserom.gba", 0x2349BC, 0x10
@@ -174,7 +219,16 @@ gUnknown_824EFF0:: @ 824EFF0
.incbin "baserom.gba", 0x24EFF0, 0x18
gUnknown_824F008:: @ 824F008
.incbin "baserom.gba", 0x24F008, 0x40
.incbin "baserom.gba", 0x24F008, 0x8
gUnknown_824F010:: @ 824F010
.incbin "baserom.gba", 0x24F010, 0x8
gUnknown_824F018:: @ 824F018
.incbin "baserom.gba", 0x24F018, 0x8
gUnknown_824F020:: @ 824F020
.incbin "baserom.gba", 0x24F020, 0x28
gUnknown_824F048:: @ 824F048
.incbin "baserom.gba", 0x24F048, 0x8
@@ -302,251 +356,6 @@ gUnknown_8250A34:: @ 8250A34
gUnknown_8250B20:: @ 8250B20
.incbin "baserom.gba", 0x250B20, 0xE4
gBattleMoves:: @ 8250C04
.incbin "baserom.gba", 0x250C04, 0x10B4
gUnknown_8251CB8:: @ 8251CB8
.incbin "baserom.gba", 0x251CB8, 0x336
gUnknown_8251FEE:: @ 8251FEE
.incbin "baserom.gba", 0x251FEE, 0x336
gUnknown_8252324:: @ 8252324
.incbin "baserom.gba", 0x252324, 0x338
gSpindaSpotGraphics:: @ 825265C
.incbin "baserom.gba", 0x25265C, 0x260
gItemEffectTable:: @ 82528BC
.incbin "baserom.gba", 0x2528BC, 0x28C
gNatureStatTable:: @ 8252B48
.incbin "baserom.gba", 0x252B48, 0x80
gTMHMLearnsets:: @ 8252BC8
.incbin "baserom.gba", 0x252BC8, 0xCE0
gFacilityClassToPicIndex:: @ 82538A8
.incbin "baserom.gba", 0x2538A8, 0x96
gFacilityClassToTrainerClass:: @ 825393E
.byte CLASS_AQUA_LEADER
.byte CLASS_TEAM_AQUA
.byte CLASS_TEAM_AQUA
.byte CLASS_AROMA_LADY
.byte CLASS_RUIN_MANIAC
.byte CLASS_INTERVIEWER
.byte CLASS_TUBER
.byte CLASS_TUBER_2
.byte CLASS_COOLTRAINER
.byte CLASS_COOLTRAINER
.byte CLASS_HEX_MANIAC
.byte CLASS_LADY
.byte CLASS_BEAUTY
.byte CLASS_RICH_BOY
.byte CLASS_POKEMANIAC
.byte CLASS_SWIMMER_MALE
.byte CLASS_BLACK_BELT
.byte CLASS_GUITARIST
.byte CLASS_KINDLER
.byte CLASS_CAMPER
.byte CLASS_BUG_MANIAC
.byte CLASS_PSYCHIC
.byte CLASS_PSYCHIC
.byte CLASS_GENTLEMAN
.byte CLASS_ELITE_FOUR
.byte CLASS_ELITE_FOUR
.byte CLASS_LEADER
.byte CLASS_LEADER
.byte CLASS_LEADER
.byte CLASS_SCHOOL_KID
.byte CLASS_SCHOOL_KID
.byte CLASS_SR_AND_JR
.byte CLASS_POKEFAN
.byte CLASS_POKEFAN
.byte CLASS_EXPERT
.byte CLASS_EXPERT
.byte CLASS_YOUNGSTER
.byte CLASS_CHAMPION
.byte CLASS_FISHERMAN
.byte CLASS_TRIATHLETE
.byte CLASS_TRIATHLETE
.byte CLASS_TRIATHLETE
.byte CLASS_TRIATHLETE
.byte CLASS_TRIATHLETE
.byte CLASS_TRIATHLETE
.byte CLASS_DRAGON_TAMER
.byte CLASS_BIRD_KEEPER
.byte CLASS_NINJA_BOY
.byte CLASS_BATTLE_GIRL
.byte CLASS_PARASOL_LADY
.byte CLASS_SWIMMER_FEMALE
.byte CLASS_PICNICKER
.byte CLASS_TWINS
.byte CLASS_SAILOR
.byte CLASS_BOARDER
.byte CLASS_BOARDER
.byte CLASS_COLLECTOR
.byte CLASS_PKMN_TRAINER_3
.byte CLASS_PKMN_TRAINER_3
.byte CLASS_PKMN_TRAINER_3
.byte CLASS_PKMN_TRAINER_3
.byte CLASS_PKMN_TRAINER_3
.byte CLASS_PKMN_TRAINER_3
.byte CLASS_PKMN_TRAINER_3
.byte CLASS_PKMN_BREEDER
.byte CLASS_PKMN_BREEDER
.byte CLASS_PKMN_RANGER
.byte CLASS_PKMN_RANGER
.byte CLASS_MAGMA_LEADER
.byte CLASS_TEAM_MAGMA
.byte CLASS_TEAM_MAGMA
.byte CLASS_LASS
.byte CLASS_BUG_CATCHER
.byte CLASS_HIKER
.byte CLASS_YOUNG_COUPLE
.byte CLASS_OLD_COUPLE
.byte CLASS_SIS_AND_BRO
.byte CLASS_AQUA_ADMIN
.byte CLASS_AQUA_ADMIN
.byte CLASS_MAGMA_ADMIN
.byte CLASS_MAGMA_ADMIN
.byte CLASS_LEADER
.byte CLASS_LEADER
.byte CLASS_LEADER
.byte CLASS_LEADER
.byte CLASS_LEADER
.byte CLASS_ELITE_FOUR
.byte CLASS_ELITE_FOUR
.byte CLASS_YOUNGSTER_2
.byte CLASS_BUG_CATCHER_2
.byte CLASS_LASS_2
.byte CLASS_SAILOR_2
.byte CLASS_CAMPER_2
.byte CLASS_PICNICKER_2
.byte CLASS_POKEMANIAC_2
.byte CLASS_SUPER_NERD
.byte CLASS_HIKER_2
.byte CLASS_BIKER
.byte CLASS_BURGLAR
.byte CLASS_ENGINEER
.byte CLASS_FISHERMAN_2
.byte CLASS_SWIMMER_MALE_2
.byte CLASS_CUE_BALL
.byte CLASS_GAMER
.byte CLASS_BEAUTY_2
.byte CLASS_SWIMMER_FEMALE_2
.byte CLASS_PSYCHIC_2
.byte CLASS_ROCKER
.byte CLASS_JUGGLER
.byte CLASS_TAMER
.byte CLASS_BIRD_KEEPER_2
.byte CLASS_BLACK_BELT_2
.byte CLASS_RIVAL
.byte CLASS_SCIENTIST
.byte CLASS_BOSS
.byte CLASS_TEAM_ROCKET
.byte CLASS_COOLTRAINER_2
.byte CLASS_COOLTRAINER_2
.byte CLASS_ELITE_FOUR_2
.byte CLASS_ELITE_FOUR_2
.byte CLASS_LEADER_2
.byte CLASS_LEADER_2
.byte CLASS_GENTLEMAN_2
.byte CLASS_RIVAL_2
.byte CLASS_CHAMPION_2
.byte CLASS_CHANNELER
.byte CLASS_TWINS_2
.byte CLASS_COOL_COUPLE
.byte CLASS_YOUNG_COUPLE_2
.byte CLASS_CRUSH_KIN
.byte CLASS_SIS_AND_BRO_2
.byte CLASS_PKMN_PROF
.byte CLASS_PLAYER
.byte CLASS_PLAYER
.byte CLASS_PLAYER
.byte CLASS_PLAYER
.byte CLASS_TEAM_ROCKET
.byte CLASS_PSYCHIC_2
.byte CLASS_CRUSH_GIRL
.byte CLASS_TUBER_3
.byte CLASS_PKMN_BREEDER_2
.byte CLASS_PKMN_RANGER_2
.byte CLASS_PKMN_RANGER_2
.byte CLASS_AROMA_LADY_2
.byte CLASS_RUIN_MANIAC_2
.byte CLASS_LADY_2
.byte CLASS_PAINTER
.byte CLASS_ELITE_FOUR_2
.byte CLASS_ELITE_FOUR_2
.byte CLASS_CHAMPION_2
gUnknown_82539D4:: @ 82539D4
.incbin "baserom.gba", 0x2539D4, 0x110
gExperienceTables:: @ 8253AE4
.incbin "baserom.gba", 0x253AE4, 0xCA0
gBaseStats:: @ 8254784
.incbin "baserom.gba", 0x254784, 0x11
gUnknown_8254795:: @ 8254795
.incbin "baserom.gba", 0x254795, 0x4FBF
gEvolutionTable:: @ 8259754
.incbin "baserom.gba", 0x259754, 0x4060
gLevelUpLearnsets:: @ 825D7B4
.incbin "baserom.gba", 0x25D7B4, 0x670
gPokeblockFlavorCompatibilityTable:: @ 825DE24
.incbin "baserom.gba", 0x25DE24, 0x7D
gUnknown_825DEA1:: @ 825DEA1
.incbin "baserom.gba", 0x25DEA1, 0x4
gPPUpWriteMasks:: @ 825DEA5
.incbin "baserom.gba", 0x25DEA5, 0x4
gUnknown_825DEA9:: @ 825DEA9
.incbin "baserom.gba", 0x25DEA9, 0x4
gStatStageRatios:: @ 825DEAD
.incbin "baserom.gba", 0x25DEAD, 0x1F
sHoldEffectToType:: @ 825DECC
.incbin "baserom.gba", 0x25DECC, 0x24
gUnknown_825DEF0:: @ 825DEF0
.incbin "baserom.gba", 0x25DEF0, 0x60
gUnknown_825DF50:: @ 825DF50
.incbin "baserom.gba", 0x25DF50, 0x90
sSecretBaseFacilityClasses:: @ 825DFE0
.incbin "baserom.gba", 0x25DFE0, 0xA
sGetMonDataEVConstants:: @ 825DFEA
.incbin "baserom.gba", 0x25DFEA, 0x6
gUnknown_825DFF0:: @ 825DFF0
.incbin "baserom.gba", 0x25DFF0, 0x6
sFriendshipEventDeltas:: @ 825DFF6
.incbin "baserom.gba", 0x25DFF6, 0x1E
sHMMoves:: @ 825E014
.incbin "baserom.gba", 0x25E014, 0x12
gUnknown_825E026:: @ 825E026
.incbin "baserom.gba", 0x25E026, 0xC
gUnknown_825E032:: @ 825E032
.incbin "baserom.gba", 0x25E032, 0x2A
gUnknown_825E05C:: @ 825E05C
.incbin "baserom.gba", 0x25E05C, 0x18
.section .rodata.825EF0C
.align 2
data/data_835B488.s
+9 -32
View File
@@ -542,38 +542,9 @@ gUnknown_83D414C:: @ 83D414C
.incbin "baserom.gba", 0x3D414C, 0x18
gUnknown_83D4164:: @ 83D4164
.incbin "baserom.gba", 0x3D4164, 0x80
gUnknown_83D41E4:: @ 83D41E4
.incbin "baserom.gba", 0x3D41E4, 0x8
gUnknown_83D41EC:: @ 83D41EC
.incbin "baserom.gba", 0x3D41EC, 0x8
gUnknown_83D41F4:: @ 83D41F4
.incbin "baserom.gba", 0x3D41F4, 0x8
gUnknown_83D41FC:: @ 83D41FC
.incbin "baserom.gba", 0x3D41FC, 0x44
gUnknown_83D4240:: @ 83D4240
.incbin "baserom.gba", 0x3D4240, 0x8
gUnknown_83D4248:: @ 83D4248
.incbin "baserom.gba", 0x3D4248, 0x8
gUnknown_83D4250:: @ 83D4250
.incbin "baserom.gba", 0x3D4250, 0x2C
gUnknown_83D427C:: @ 83D427C
.incbin "baserom.gba", 0x3D427C, 0x18
gUnknown_83D4294:: @ 83D4294
.incbin "baserom.gba", 0x3D4294, 0x6D94
gItems:: @ 83DB028
.incbin "baserom.gba", 0x3DB028, 0x4074
.incbin "baserom.gba", 0x3D4164, 0x8
.section .rodata.83DF09C
gUnknown_83DF09C:: @ 83DF09C
.incbin "baserom.gba", 0x3DF09C, 0x18
@@ -803,7 +774,13 @@ gUnknown_83E27AC:: @ 83E27AC
.incbin "baserom.gba", 0x3E27AC, 0x1A8
gUnknown_83E2954:: @ 83E2954
.incbin "baserom.gba", 0x3E2954, 0x134
.4byte sub_8124C8C
.4byte CB2_ReturnToField
.4byte NULL
.4byte NULL
gUnknown_83E2964:: @ 83E2964
.incbin "baserom.gba", 0x3E2964, 0x124
gUnknown_83E2A88:: @ 83E2A88
.incbin "baserom.gba", 0x3E2A88, 0x4F0
data/data_83F5738.s
+3 -20
View File
@@ -105,26 +105,9 @@ gUnknown_83F6366:: @ 83F6366
gUnknown_83F637C:: @ 83F637C
.incbin "baserom.gba", 0x3F637C, 0xC
gUnknown_83F6388:: @ 83F6388
.incbin "baserom.gba", 0x3F6388, 0xC0
gUnknown_83F6448:: @ 83F6448
.incbin "baserom.gba", 0x3F6448, 0x20
gUnknown_83F6468:: @ 83F6468
.incbin "baserom.gba", 0x3F6468, 0x800
gUnknown_83F6C68:: @ 83F6C68
.incbin "baserom.gba", 0x3F6C68, 0x10
gUnknown_83F6C78:: @ 83F6C78
.incbin "baserom.gba", 0x3F6C78, 0x4
gUnknown_83F6C7C:: @ 83F6C7C
.incbin "baserom.gba", 0x3F6C7C, 0x8
gUnknown_83F6C84:: @ 83F6C84
.incbin "baserom.gba", 0x3F6C84, 0x2C
.section .rodata.83F6C90
gUnknown_83F6C90:: @ 83F6C90
.incbin "baserom.gba", 0x3F6C90, 0x20
gUnknown_83F6CB0:: @ 83F6CB0
.incbin "baserom.gba", 0x3F6CB0, 0x6F8
data/data_83FECCC.s
+14 -2460
View File
File diff suppressed because it is too large Load Diff
data/data_8468C98.s
+6 -2
View File
@@ -138,10 +138,14 @@ gUnknown_846D953:: @ 846D953
.incbin "baserom.gba", 0x46D953, 0xD
gUnknown_846D960:: @ 846D960
.incbin "baserom.gba", 0x46D960, 0x8
obj_tiles gUnknown_8479688, 0, 800
gUnknown_846D968:: @ 846D968
.incbin "baserom.gba", 0x46D968, 0x40
obj_pal gUnknown_8479668, 800
gUnknown_846D970::
.2byte 0x0006, 0x0008, 0x0010, 0x0008, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0002, 0x0006
.2byte 0x0006, 0x0008, 0x0010, 0x0008, 0x0014, 0x0006, 0x0002, 0x0006, 0x0006, 0x0008, 0x000b, 0x0006, 0x0010, 0x0008, 0x0014, 0x0006
gUnknown_846D9A8:: @ 846D9A8
.incbin "baserom.gba", 0x46D9A8, 0x2C
data/data_8471F00.s
+421 -152
View File
@@ -215,173 +215,88 @@ gUnknown_84791E8:: @ 84791E8
gUnknown_84792D0:: @ 84792D0
.incbin "baserom.gba", 0x4792D0, 0x10
gUnknown_84792E0:: @ 84792E0
.incbin "baserom.gba", 0x4792E0, 0x10
gUnknown_84792F0:: @ 84792F0
.incbin "baserom.gba", 0x4792F0, 0x50
gUnknown_8479340:: @ 8479340
.incbin "baserom.gba", 0x479340, 0x28
gUnknown_8479368:: @ 8479368
.incbin "baserom.gba", 0x479368, 0x18
gUnknown_8479380:: @ 8479380
.incbin "baserom.gba", 0x479380, 0x10
gUnknown_8479390:: @ 8479390
.incbin "baserom.gba", 0x479390, 0x1B8
gUnknown_8479548:: @ 8479548
.incbin "baserom.gba", 0x479548, 0x18
gUnknown_8479560:: @ 8479560
.4byte gUnknown_841B8BF
.4byte gUnknown_841BB40
.4byte gUnknown_841BE76
.4byte gUnknown_841C23B
.4byte gUnknown_841C459
.4byte gUnknown_841C82A
gUnknown_8479578:: @ 8479578
.incbin "baserom.gba", 0x479578, 0x18
gUnknown_8479590:: @ 8479590
.incbin "baserom.gba", 0x479590, 0x28
gUnknown_84795B8:: @ 84795B8
.incbin "baserom.gba", 0x4795B8, 0x10
gUnknown_84795C8:: @ 84795C8
.incbin "baserom.gba", 0x4795C8, 0x90
.section .rodata.8479668
.align 2
gUnknown_8479668:: @ 8479668
.incbin "baserom.gba", 0x479668, 0x5F0
.incbin "graphics/misc/unk_8479688.gbapal"
gUnknown_8479C58:: @ 8479C58
.incbin "baserom.gba", 0x479C58, 0x30
gUnknown_8479688::
.incbin "graphics/misc/unk_8479688.4bpp.lz"
gUnknown_8479C88:: @ 8479C88
.incbin "baserom.gba", 0x479C88, 0x38
gUnknown_8479CC0:: @ 8479CC0
.incbin "baserom.gba", 0x479CC0, 0x18
.align 2
gUnknown_8479CD8:: @ 8479CD8
.asciz "C:/WORK/POKeFRLG/src/pm_lgfr_ose/source/cereader_tool.c"
.align 2
gUnknown_8479D10:: @ 8479D10
.asciz "ttdata->dummy == 0"
.align 2
gUnknown_8479D24:: @ 8479D24
.asciz "ttdata->id == 0"
// trainer_tower
gUnknown_8479748::
.incbin "graphics/misc/unk_8479748.4bpp.lz"
.section .rodata.after_trainer_tower
// unk_815F138
gUnknown_847A328::
.incbin "data/graphics/unk_847a348.gbapal"
gUnknown_847A348::
.incbin "data/graphics/unk_847a348.4bpp.lz"
gUnknown_847A79C:: @ 847A79C
obj_tiles gUnknown_847A348, 0xE00, 0
gUnknown_847A7A4:: @ 847A7A4
obj_pal gUnknown_847A328, 0
gOamData_847A7AC::
.4byte 0x80000300, 0x00000000
gOamData_847A7B4::
.4byte 0xc0004000, 0x00000000
gUnknown_847A7BC::
obj_image_anim_frame 0, 1
obj_image_anim_end
gUnknown_847A7C4::
obj_image_anim_frame 16, 1
obj_image_anim_end
gUnknown_847A7CC::
obj_image_anim_frame 32, 1
obj_image_anim_end
gUnknown_847A7D4::
.4byte gUnknown_847A7BC
.4byte gUnknown_847A7C4
.4byte gUnknown_847A7CC
gUnknown_847A7E0::
obj_image_anim_frame 48, 1
obj_image_anim_end
gUnknown_847A7E8::
obj_image_anim_frame 80, 1
obj_image_anim_end
gUnknown_847A7F0::
.4byte gUnknown_847A7E0
.4byte gUnknown_847A7E8
gUnknown_847A7F8::
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_end
gUnknown_847A808::
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_frame 0x10, -0x10, 0, 8
obj_rot_scal_anim_end
gUnknown_847A820::
obj_rot_scal_anim_frame -0x12, 0x12, 0, 8
obj_rot_scal_anim_end
gUnknown_847A830::
obj_rot_scal_anim_frame 0x6, -0x6, 0, 8
obj_rot_scal_anim_frame -0x4, 0x4, 0, 8
obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
obj_rot_scal_anim_end
gUnknown_847A850::
.4byte gUnknown_847A7F8
.4byte gUnknown_847A808
.4byte gUnknown_847A820
.4byte gUnknown_847A830
gUnknown_847A860:: @ 847A860
spr_template 0, 0, gOamData_847A7AC, gUnknown_847A7D4, NULL, gUnknown_847A850, SpriteCallbackDummy
gUnknown_847A878:: @ 847A878
spr_template 0, 0, gOamData_847A7B4, gUnknown_847A7F0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
// berry_fix_program
gUnknown_847A890:: @ 847A890
.4byte gUnknown_8EA467C, gUnknown_8EA52B8, gUnknown_8EA463C
.4byte gUnknown_8EA5664, gUnknown_8EA60C8, gUnknown_8EA5604
.4byte gUnknown_8EA6408, gUnknown_8EA7028, gUnknown_8EA63C8
.4byte gUnknown_8EA7320, gUnknown_8EA8118, gUnknown_8EA72E0
.4byte gUnknown_8EA8408, gUnknown_8EA8CC8, gUnknown_8EA83C8
.4byte gUnknown_8EA8F40, gUnknown_8EA9588, gUnknown_8EA8F00
gUnknown_847A8D8::
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
.incbin "baserom.gba", 0x47A8D8, 0x2D4
gUnknown_847A8FA::
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
gUnknown_847A913::
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
gUnknown_847A934::
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
.string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 26}.$"
.string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 6}k{CLEAR 6}l{CLEAR 7} {CLEAR 26},$"
.string "{CLEAR 11}m{CLEAR 6}n{CLEAR 7}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
.string "{CLEAR 12}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 26}.$"
.string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 26},$"
.string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
.string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
.string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
.string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
.string "{CLEAR 11}!{CLEAR 16}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 16}-$"
.string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 18}'{CLEAR 18} $"
.string "ABCDE$"
.string "FGHIJ$"
.string "KLMNO$"
.string "PQRST$"
.string "UVWXY$"
.string "Z $"
.string "01234$"
.string "56789$"
.string ".,!? $"
.string "-/&… $"
.string "abcde$"
.string "fghij$"
.string "klmno$"
.string "pqrst$"
.string "uvwxy$"
.string "z $"
.string "01234$"
.string "56789$"
.string ".,!? $"
.string "-/&… $"
.string "$"
.string "$"
.string "$"
.string "$"
.string "$"
.string "$"
.string "$"
.string "$"
.string "{EXTRA 245}{EXTRA 246}{EXTRA 247}{EXTRA 248}{EXTRA 254}$"
.string "{EXTRA 249}{EXTRA 250}{EXTRA 252}{EXTRA 251}{EXTRA 253}$"
.string "{EXTRA 236}{EXTRA 237}{EXTRA 238}{EXTRA 235}{EXTRA 234}$"
.string "♂♀{EXTRA 212}{EXTRA 213}{EXTRA 211}$"
.string "{EXTRA 216}{EXTRA 217}{EXTRA 242}{EXTRA 243}{EXTRA 244}$"
.string "{EXTRA 218}{EXTRA 241}{EXTRA 224}{EXTRA 226}{EXTRA 227}$"
.string "{EXTRA 240}{EXTRA 239}{EXTRA 225}{EXTRA 214}{EXTRA 215}$"
.string "{EXTRA 228}{EXTRA 229}{EXTRA 230}{EXTRA 231}{EXTRA 232}$"
.string "{EXTRA 233}{EXTRA 220}{EXTRA 221}{EXTRA 222}{EXTRA 209}$"
.string "{EXTRA 210}{EXTRA 208}ょ: $"
// trainer_tower (again?)
@ 847ABAC
.align 2
.include "data/trainer_tower/trainers.inc"
.align 2
@@ -426,5 +341,359 @@ gUnknown_84827B4:: @ 84827B4
.include "data/text/move_descriptions.inc"
.align 2, 0
gUnknown_84886E8:: @ 84886E8
.incbin "baserom.gba", 0x4886E8, 0x588
.4byte gMoveDescription_Pound
.4byte gMoveDescription_KarateChop
.4byte gMoveDescription_DoubleSlap
.4byte gMoveDescription_CometPunch
.4byte gMoveDescription_MegaPunch
.4byte gMoveDescription_PayDay
.4byte gMoveDescription_FirePunch
.4byte gMoveDescription_IcePunch
.4byte gMoveDescription_ThunderPunch
.4byte gMoveDescription_Scratch
.4byte gMoveDescription_ViceGrip
.4byte gMoveDescription_Guillotine
.4byte gMoveDescription_RazorWind
.4byte gMoveDescription_SwordsDance
.4byte gMoveDescription_Cut
.4byte gMoveDescription_Gust
.4byte gMoveDescription_WingAttack
.4byte gMoveDescription_Whirlwind
.4byte gMoveDescription_Fly
.4byte gMoveDescription_Bind
.4byte gMoveDescription_Slam
.4byte gMoveDescription_VineWhip
.4byte gMoveDescription_Stomp
.4byte gMoveDescription_DoubleKick
.4byte gMoveDescription_MegaKick
.4byte gMoveDescription_JumpKick
.4byte gMoveDescription_RollingKick
.4byte gMoveDescription_SandAttack
.4byte gMoveDescription_Headbutt
.4byte gMoveDescription_HornAttack
.4byte gMoveDescription_FuryAttack
.4byte gMoveDescription_HornDrill
.4byte gMoveDescription_Tackle
.4byte gMoveDescription_BodySlam
.4byte gMoveDescription_Wrap
.4byte gMoveDescription_TakeDown
.4byte gMoveDescription_Thrash
.4byte gMoveDescription_DoubleEdge
.4byte gMoveDescription_TailWhip
.4byte gMoveDescription_PoisonSting
.4byte gMoveDescription_Twineedle
.4byte gMoveDescription_PinMissile
.4byte gMoveDescription_Leer
.4byte gMoveDescription_Bite
.4byte gMoveDescription_Growl
.4byte gMoveDescription_Roar
.4byte gMoveDescription_Sing
.4byte gMoveDescription_Supersonic
.4byte gMoveDescription_SonicBoom
.4byte gMoveDescription_Disable
.4byte gMoveDescription_Acid
.4byte gMoveDescription_Ember
.4byte gMoveDescription_Flamethrower
.4byte gMoveDescription_Mist
.4byte gMoveDescription_WaterGun
.4byte gMoveDescription_HydroPump
.4byte gMoveDescription_Surf
.4byte gMoveDescription_IceBeam
.4byte gMoveDescription_Blizzard
.4byte gMoveDescription_Psybeam
.4byte gMoveDescription_BubbleBeam
.4byte gMoveDescription_AuroraBeam
.4byte gMoveDescription_HyperBeam
.4byte gMoveDescription_Peck
.4byte gMoveDescription_DrillPeck
.4byte gMoveDescription_Submission
.4byte gMoveDescription_LowKick
.4byte gMoveDescription_Counter
.4byte gMoveDescription_SeismicToss
.4byte gMoveDescription_Strength
.4byte gMoveDescription_Absorb
.4byte gMoveDescription_MegaDrain
.4byte gMoveDescription_LeechSeed
.4byte gMoveDescription_Growth
.4byte gMoveDescription_RazorLeaf
.4byte gMoveDescription_SolarBeam
.4byte gMoveDescription_PoisonPowder
.4byte gMoveDescription_StunSpore
.4byte gMoveDescription_SleepPowder
.4byte gMoveDescription_PetalDance
.4byte gMoveDescription_StringShot
.4byte gMoveDescription_DragonRage
.4byte gMoveDescription_FireSpin
.4byte gMoveDescription_ThunderShock
.4byte gMoveDescription_Thunderbolt
.4byte gMoveDescription_ThunderWave
.4byte gMoveDescription_Thunder
.4byte gMoveDescription_RockThrow
.4byte gMoveDescription_Earthquake
.4byte gMoveDescription_Fissure
.4byte gMoveDescription_Dig
.4byte gMoveDescription_Toxic
.4byte gMoveDescription_Confusion
.4byte gMoveDescription_Psychic
.4byte gMoveDescription_Hypnosis
.4byte gMoveDescription_Meditate
.4byte gMoveDescription_Agility
.4byte gMoveDescription_QuickAttack
.4byte gMoveDescription_Rage
.4byte gMoveDescription_Teleport
.4byte gMoveDescription_NightShade
.4byte gMoveDescription_Mimic
.4byte gMoveDescription_Screech
.4byte gMoveDescription_DoubleTeam
.4byte gMoveDescription_Recover
.4byte gMoveDescription_Harden
.4byte gMoveDescription_Minimize
.4byte gMoveDescription_Smokescreen
.4byte gMoveDescription_ConfuseRay
.4byte gMoveDescription_Withdraw
.4byte gMoveDescription_DefenseCurl
.4byte gMoveDescription_Barrier
.4byte gMoveDescription_LightScreen
.4byte gMoveDescription_Haze
.4byte gMoveDescription_Reflect
.4byte gMoveDescription_FocusEnergy
.4byte gMoveDescription_Bide
.4byte gMoveDescription_Metronome
.4byte gMoveDescription_MirrorMove
.4byte gMoveDescription_SelfDestruct
.4byte gMoveDescription_EggBomb
.4byte gMoveDescription_Lick
.4byte gMoveDescription_Smog
.4byte gMoveDescription_Sludge
.4byte gMoveDescription_BoneClub
.4byte gMoveDescription_FireBlast
.4byte gMoveDescription_Waterfall
.4byte gMoveDescription_Clamp
.4byte gMoveDescription_Swift
.4byte gMoveDescription_SkullBash
.4byte gMoveDescription_SpikeCannon
.4byte gMoveDescription_Constrict
.4byte gMoveDescription_Amnesia
.4byte gMoveDescription_Kinesis
.4byte gMoveDescription_SoftBoiled
.4byte gMoveDescription_HiJumpKick
.4byte gMoveDescription_Glare
.4byte gMoveDescription_DreamEater
.4byte gMoveDescription_PoisonGas
.4byte gMoveDescription_Barrage
.4byte gMoveDescription_LeechLife
.4byte gMoveDescription_LovelyKiss
.4byte gMoveDescription_SkyAttack
.4byte gMoveDescription_Transform
.4byte gMoveDescription_Bubble
.4byte gMoveDescription_DizzyPunch
.4byte gMoveDescription_Spore
.4byte gMoveDescription_Flash
.4byte gMoveDescription_Psywave
.4byte gMoveDescription_Splash
.4byte gMoveDescription_AcidArmor
.4byte gMoveDescription_Crabhammer
.4byte gMoveDescription_Explosion
.4byte gMoveDescription_FurySwipes
.4byte gMoveDescription_Bonemerang
.4byte gMoveDescription_Rest
.4byte gMoveDescription_RockSlide
.4byte gMoveDescription_HyperFang
.4byte gMoveDescription_Sharpen
.4byte gMoveDescription_Conversion
.4byte gMoveDescription_TriAttack
.4byte gMoveDescription_SuperFang
.4byte gMoveDescription_Slash
.4byte gMoveDescription_Substitute
.4byte gMoveDescription_Struggle
.4byte gMoveDescription_Sketch
.4byte gMoveDescription_TripleKick
.4byte gMoveDescription_Thief
.4byte gMoveDescription_SpiderWeb
.4byte gMoveDescription_MindReader
.4byte gMoveDescription_Nightmare
.4byte gMoveDescription_FlameWheel
.4byte gMoveDescription_Snore
.4byte gMoveDescription_Curse
.4byte gMoveDescription_Flail
.4byte gMoveDescription_Conversion2
.4byte gMoveDescription_Aeroblast
.4byte gMoveDescription_CottonSpore
.4byte gMoveDescription_Reversal
.4byte gMoveDescription_Spite
.4byte gMoveDescription_PowderSnow
.4byte gMoveDescription_Protect
.4byte gMoveDescription_MachPunch
.4byte gMoveDescription_ScaryFace
.4byte gMoveDescription_FaintAttack
.4byte gMoveDescription_SweetKiss
.4byte gMoveDescription_BellyDrum
.4byte gMoveDescription_SludgeBomb
.4byte gMoveDescription_MudSlap
.4byte gMoveDescription_Octazooka
.4byte gMoveDescription_Spikes
.4byte gMoveDescription_ZapCannon
.4byte gMoveDescription_Foresight
.4byte gMoveDescription_DestinyBond
.4byte gMoveDescription_PerishSong
.4byte gMoveDescription_IcyWind
.4byte gMoveDescription_Detect
.4byte gMoveDescription_BoneRush
.4byte gMoveDescription_LockOn
.4byte gMoveDescription_Outrage
.4byte gMoveDescription_Sandstorm
.4byte gMoveDescription_GigaDrain
.4byte gMoveDescription_Endure
.4byte gMoveDescription_Charm
.4byte gMoveDescription_Rollout
.4byte gMoveDescription_FalseSwipe
.4byte gMoveDescription_Swagger
.4byte gMoveDescription_MilkDrink
.4byte gMoveDescription_Spark
.4byte gMoveDescription_FuryCutter
.4byte gMoveDescription_SteelWing
.4byte gMoveDescription_MeanLook
.4byte gMoveDescription_Attract
.4byte gMoveDescription_SleepTalk
.4byte gMoveDescription_HealBell
.4byte gMoveDescription_Return
.4byte gMoveDescription_Present
.4byte gMoveDescription_Frustration
.4byte gMoveDescription_Safeguard
.4byte gMoveDescription_PainSplit
.4byte gMoveDescription_SacredFire
.4byte gMoveDescription_Magnitude
.4byte gMoveDescription_DynamicPunch
.4byte gMoveDescription_Megahorn
.4byte gMoveDescription_DragonBreath
.4byte gMoveDescription_BatonPass
.4byte gMoveDescription_Encore
.4byte gMoveDescription_Pursuit
.4byte gMoveDescription_RapidSpin
.4byte gMoveDescription_SweetScent
.4byte gMoveDescription_IronTail
.4byte gMoveDescription_MetalClaw
.4byte gMoveDescription_VitalThrow
.4byte gMoveDescription_MorningSun
.4byte gMoveDescription_Synthesis
.4byte gMoveDescription_Moonlight
.4byte gMoveDescription_HiddenPower
.4byte gMoveDescription_CrossChop
.4byte gMoveDescription_Twister
.4byte gMoveDescription_RainDance
.4byte gMoveDescription_SunnyDay
.4byte gMoveDescription_Crunch
.4byte gMoveDescription_MirrorCoat
.4byte gMoveDescription_PsychUp
.4byte gMoveDescription_ExtremeSpeed
.4byte gMoveDescription_AncientPower
.4byte gMoveDescription_ShadowBall
.4byte gMoveDescription_FutureSight
.4byte gMoveDescription_RockSmash
.4byte gMoveDescription_Whirlpool
.4byte gMoveDescription_BeatUp
.4byte gMoveDescription_FakeOut
.4byte gMoveDescription_Uproar
.4byte gMoveDescription_Stockpile
.4byte gMoveDescription_SpitUp
.4byte gMoveDescription_Swallow
.4byte gMoveDescription_HeatWave
.4byte gMoveDescription_Hail
.4byte gMoveDescription_Torment
.4byte gMoveDescription_Flatter
.4byte gMoveDescription_WillOWisp
.4byte gMoveDescription_Memento
.4byte gMoveDescription_Facade
.4byte gMoveDescription_FocusPunch
.4byte gMoveDescription_SmellingSalt
.4byte gMoveDescription_FollowMe
.4byte gMoveDescription_NaturePower
.4byte gMoveDescription_Charge
.4byte gMoveDescription_Taunt
.4byte gMoveDescription_HelpingHand
.4byte gMoveDescription_Trick
.4byte gMoveDescription_RolePlay
.4byte gMoveDescription_Wish
.4byte gMoveDescription_Assist
.4byte gMoveDescription_Ingrain
.4byte gMoveDescription_Superpower
.4byte gMoveDescription_MagicCoat
.4byte gMoveDescription_Recycle
.4byte gMoveDescription_Revenge
.4byte gMoveDescription_BrickBreak
.4byte gMoveDescription_Yawn
.4byte gMoveDescription_KnockOff
.4byte gMoveDescription_Endeavor
.4byte gMoveDescription_Eruption
.4byte gMoveDescription_SkillSwap
.4byte gMoveDescription_Imprison
.4byte gMoveDescription_Refresh
.4byte gMoveDescription_Grudge
.4byte gMoveDescription_Snatch
.4byte gMoveDescription_SecretPower
.4byte gMoveDescription_Dive
.4byte gMoveDescription_ArmThrust
.4byte gMoveDescription_Camouflage
.4byte gMoveDescription_TailGlow
.4byte gMoveDescription_LusterPurge
.4byte gMoveDescription_MistBall
.4byte gMoveDescription_FeatherDance
.4byte gMoveDescription_TeeterDance
.4byte gMoveDescription_BlazeKick
.4byte gMoveDescription_MudSport
.4byte gMoveDescription_IceBall
.4byte gMoveDescription_NeedleArm
.4byte gMoveDescription_SlackOff
.4byte gMoveDescription_HyperVoice
.4byte gMoveDescription_PoisonFang
.4byte gMoveDescription_CrushClaw
.4byte gMoveDescription_BlastBurn
.4byte gMoveDescription_HydroCannon
.4byte gMoveDescription_MeteorMash
.4byte gMoveDescription_Astonish
.4byte gMoveDescription_WeatherBall
.4byte gMoveDescription_Aromatherapy
.4byte gMoveDescription_FakeTears
.4byte gMoveDescription_AirCutter
.4byte gMoveDescription_Overheat
.4byte gMoveDescription_OdorSleuth
.4byte gMoveDescription_RockTomb
.4byte gMoveDescription_SilverWind
.4byte gMoveDescription_MetalSound
.4byte gMoveDescription_GrassWhistle
.4byte gMoveDescription_Tickle
.4byte gMoveDescription_CosmicPower
.4byte gMoveDescription_WaterSpout
.4byte gMoveDescription_SignalBeam
.4byte gMoveDescription_ShadowPunch
.4byte gMoveDescription_Extrasensory
.4byte gMoveDescription_SkyUppercut
.4byte gMoveDescription_SandTomb
.4byte gMoveDescription_SheerCold
.4byte gMoveDescription_MuddyWater
.4byte gMoveDescription_BulletSeed
.4byte gMoveDescription_AerialAce
.4byte gMoveDescription_IcicleSpear
.4byte gMoveDescription_IronDefense
.4byte gMoveDescription_Block
.4byte gMoveDescription_Howl
.4byte gMoveDescription_DragonClaw
.4byte gMoveDescription_FrenzyPlant
.4byte gMoveDescription_BulkUp
.4byte gMoveDescription_Bounce
.4byte gMoveDescription_MudShot
.4byte gMoveDescription_PoisonTail
.4byte gMoveDescription_Covet
.4byte gMoveDescription_VoltTackle
.4byte gMoveDescription_MagicalLeaf
.4byte gMoveDescription_WaterSport
.4byte gMoveDescription_CalmMind
.4byte gMoveDescription_LeafBlade
.4byte gMoveDescription_DragonDance
.4byte gMoveDescription_RockBlast
.4byte gMoveDescription_ShockWave
.4byte gMoveDescription_WaterPulse
.4byte gMoveDescription_DoomDesire
.4byte gMoveDescription_PsychoBoost
data/graphics.s
+2443 -2444
View File
File diff suppressed because it is too large Load Diff
data/help_system.s
-8
View File
@@ -1,8 +0,0 @@
.section .rodata
.align 2
gUnknown_8464008:: @ 8464008
.incbin "baserom.gba", 0x464008, 0x120
gUnknown_8464128:: @ 8464128
.incbin "baserom.gba", 0x464128, 0x20
data/map_event_scripts.inc
+10 -32
View File
@@ -1065,7 +1065,7 @@ Text_1A5446:: @ 81A5446
.string "Want to give a nickname to the\n"
.string "{STR_VAR_2} you received?$"
gUnknown_81A5476:: @ 81A5476
gText_PkmnFainted3:: @ 81A5476
.string "{STR_VAR_1} fainted…\p"
.string "$"
@@ -3257,31 +3257,9 @@ CeladonCity_GameCorner_EventScript_1B2867:: @ 81B2867
.incbin "baserom.gba", 0x1B2867, 0xD1
FourIsland_House2_EventScript_1B2938:: @ 81B2938
.incbin "baserom.gba", 0x1B2938, 0x4E4
.incbin "baserom.gba", 0x1B2938, 0x4C0
gUnknown_81B2E1C:: @ 81B2E1C
.string "How do I do this?$"
gUnknown_81B2E2E:: @ 81B2E2E
.string "What does this term mean?$"
gUnknown_81B2E48:: @ 81B2E48
.string "About this game$"
gUnknown_81B2E58:: @ 81B2E58
.string "Type Matchup List$"
gUnknown_81B2E6A:: @ 81B2E6A
.string "EXIT$"
gUnknown_81B2E6F:: @ 81B2E6F
.incbin "baserom.gba", 0x1B2E6F, 0x15A
gUnknown_81B2FC9:: @ 81B2FC9
.incbin "baserom.gba", 0x1B2FC9, 0x52
gUnknown_81B301B:: @ 81B301B
.incbin "baserom.gba", 0x1B301B, 0x8199
.include "data/text/help_system.inc"
CeladonCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
CeruleanCity_PokemonCenter_2F_MapScript4_1BB1B4:: @ 81BB1B4
@@ -3567,7 +3545,7 @@ CeruleanCave_B1F_EventScript_1BE00C:: @ 81BE00C
CeruleanCave_1F_EventScript_1BE00C:: @ 81BE00C
.incbin "baserom.gba", 0x1BE00C, 0x58
gUnknown_81BE064:: @ 81BE064
EventScript_FldEffRockSmash:: @ 81BE064
.incbin "baserom.gba", 0x1BE064, 0xB9
MtEmber_Exterior_EventScript_1BE11D:: @ 81BE11D
@@ -3588,7 +3566,7 @@ SeafoamIslands_B1F_EventScript_1BE11D:: @ 81BE11D
VictoryRoad_2F_EventScript_1BE11D:: @ 81BE11D
.incbin "baserom.gba", 0x1BE11D, 0x51
gUnknown_81BE16E:: @ 81BE16E
EventScript_FldEffStrength:: @ 81BE16E
.incbin "baserom.gba", 0x1BE16E, 0x149
gUnknown_81BE2B7:: @ 81BE2B7
@@ -3597,7 +3575,7 @@ gUnknown_81BE2B7:: @ 81BE2B7
gUnknown_81BE2FF:: @ 81BE2FF
.incbin "baserom.gba", 0x1BE2FF, 0x265
gUnknown_81BE564:: @ 81BE564
EventScript_FailSweetScent:: @ 81BE564
.incbin "baserom.gba", 0x1BE564, 0x2A
Route2_EventScript_1BE58E:: @ 81BE58E
@@ -4200,16 +4178,16 @@ gUnknown_81BFB5F:: @ 81BFB5F
gUnknown_81BFB65:: @ 81BFB65
.incbin "baserom.gba", 0x1BFB65, 0x22
gUnknown_81BFB87:: @ 81BFB87
EventScript_SafariWarpOut:: @ 81BFB87
.incbin "baserom.gba", 0x1BFB87, 0x23
gUnknown_81BFBAA:: @ 81BFBAA
EventScript_SafariRetire:: @ 81BFBAA
.incbin "baserom.gba", 0x1BFBAA, 0x1B
gUnknown_81BFBC5:: @ 81BFBC5
EventScript_SafariTimesUp:: @ 81BFBC5
.incbin "baserom.gba", 0x1BFBC5, 0x12
gUnknown_81BFBD7:: @ 81BFBD7
EventScript_SafariOutOfBalls:: @ 81BFBD7
.incbin "baserom.gba", 0x1BFBD7, 0x2D5
gUnknown_81BFEAC:: @ 81BFEAC
data/map_events.s
+1
View File
@@ -12,6 +12,7 @@
@#include "constants/trainer_hill.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.include "constants/item_data_constants.inc"
.section .rodata
data/maps/BirthIsland_Exterior/scripts.inc
+1 -1
View File
@@ -90,7 +90,7 @@ EventScript_1652C0:: @ 81652C0
setvar VAR_0x8004, SPECIES_DEOXYS
setvar VAR_0x8005, 30
setvar VAR_0x8006, 0
special sub_8044838
special CreateObedientEnemyMon
setflag FLAG_0x807
special sub_807F9D8
waitstate
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+1 -1
View File
@@ -113,7 +113,7 @@ FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087
EventScript_1640A2:: @ 81640A2
getplayerxy VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, player_get_direction_lower_nybble
specialvar VAR_RESULT, GetPlayerFacingDirection
compare_var_to_value VAR_RESULT, 2
call_if 1, EventScript_16412E
msgbox gUnknown_817B7AE
data/maps/FuchsiaCity_SafariZone_Entrance/scripts.inc
+4 -4
View File
@@ -17,7 +17,7 @@ EventScript_16D2C8:: @ 816D2C8
closemessage
applymovement 255, Movement_16D367
waitmovement 0
special sub_80A0EEC
special ExitSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
releaseall
end
@@ -29,7 +29,7 @@ EventScript_16D2F2:: @ 816D2F2
closemessage
applymovement 255, Movement_16D362
waitmovement 0
special sub_80A0EEC
special ExitSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
releaseall
end
@@ -44,7 +44,7 @@ EventScript_16D312:: @ 816D312
closemessage
applymovement 255, Movement_16D362
waitmovement 0
special sub_80A0EEC
special ExitSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 0
releaseall
end
@@ -132,7 +132,7 @@ EventScript_16D3CA:: @ 816D3CA
call_if 1, EventScript_16D441
compare_var_to_value VAR_0x4002, 2
call_if 1, EventScript_16D457
special sub_80A0EC4
special EnterSafariMode
setvar VAR_MAP_SCENE_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE, 2
warp MAP_SAFARI_ZONE_CENTER, 255, 26, 30
waitstate
data/maps/NavelRock_Base/scripts.inc
+1 -1
View File
@@ -63,7 +63,7 @@ NavelRock_Base_EventScript_165134:: @ 8165134
setvar VAR_0x8004, SPECIES_LUGIA
setvar VAR_0x8005, 70
setvar VAR_0x8006, 0
special sub_8044838
special CreateObedientEnemyMon
setflag FLAG_0x807
special sub_807F9D8
waitstate
data/maps/NavelRock_Summit/scripts.inc
+1 -1
View File
@@ -67,7 +67,7 @@ NavelRock_Summit_EventScript_164FFB:: @ 8164FFB
setvar VAR_0x8004, SPECIES_HO_OH
setvar VAR_0x8005, 70
setvar VAR_0x8006, 0
special sub_8044838
special CreateObedientEnemyMon
setflag FLAG_0x807
special sub_807F9D8
waitstate
data/maps/Route25_SeaCottage/scripts.inc
+1 -1
View File
@@ -118,7 +118,7 @@ EventScript_17064A:: @ 817064A
setflag FLAG_0x235
setflag FLAG_0x031
setflag FLAG_0x234
setflag FLAG_0x834
setflag FLAG_SYS_NOT_SOMEONES_PC
goto EventScript_170640
end
data/maps/SSAnne_Exterior/scripts.inc
+2 -2
View File
@@ -20,13 +20,13 @@ SSAnne_Exterior_160859:: @ 8160859
call_if 4, EventScript_1608AC
fadenewbgm BGM_FRLG_SURF
delay 50
special sub_815D334
special Special_SSAnneDepartureCutscene
waitstate
removeobject 1
applymovement 255, Movement_1608B7
waitmovement 0
setvar VAR_MAP_SCENE_VERMILION_CITY, 2
setvar VAR_0x4053, 0
setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
warp MAP_VERMILION_CITY, 255, 23, 34
waitstate
releaseall
data/maps/SevenIsland_TrainerTower_Lobby/scripts.inc
+1 -1
View File
@@ -223,7 +223,7 @@ SevenIsland_TrainerTower_Lobby_EventScript_164AD8:: @ 8164AD8
lockall
fadescreen 1
setvar VAR_0x8004, 1
special sub_80CD228
special Special_BattleRecords
waitstate
releaseall
end
data/maps/VermilionCity/map.json
+2 -2
View File
@@ -207,7 +207,7 @@
"x": 22,
"y": 33,
"elevation": 0,
"var": "VAR_0x4053",
"var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER",
"var_value": 0,
"script": "VermilionCity_EventScript_166B8A"
},
@@ -216,7 +216,7 @@
"x": 23,
"y": 33,
"elevation": 0,
"var": "VAR_0x4053",
"var": "VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER",
"var_value": 0,
"script": "VermilionCity_EventScript_166B91"
},
data/maps/VermilionCity/scripts.inc
+2 -2
View File
@@ -200,7 +200,7 @@ VermilionCity_EventScript_166B91:: @ 8166B91
VermilionCity_EventScript_166B98:: @ 8166B98
lockall
setvar VAR_0x4053, 0
setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 0
releaseall
end
@@ -215,7 +215,7 @@ EventScript_166BA0:: @ 8166BA0
checkflag FLAG_0x234
goto_if 0, EventScript_166BDE
msgbox gUnknown_817FA77
setvar VAR_0x4053, 1
setvar VAR_VERMILION_CITY_TICKET_CHECK_TRIGGER, 1
releaseall
end
data/menu_indicators.s
-46
View File
@@ -1,46 +0,0 @@
.section .rodata
.align 2
gUnknown_846325C:: @ 846325C
.incbin "baserom.gba", 0x46325C, 0x48
gUnknown_84632A4:: @ 84632A4
.incbin "baserom.gba", 0x4632A4, 0x18
gUnknown_84632BC:: @ 84632BC
.incbin "baserom.gba", 0x4632BC, 0x4
gUnknown_84632C0:: @ 84632C0
.incbin "baserom.gba", 0x4632C0, 0x4
gUnknown_84632C4:: @ 84632C4
.incbin "baserom.gba", 0x4632C4, 0x4
gUnknown_84632C8:: @ 84632C8
.incbin "baserom.gba", 0x4632C8, 0x4
gUnknown_84632CC:: @ 84632CC
.incbin "baserom.gba", 0x4632CC, 0x4
gUnknown_84632D0:: @ 84632D0
.incbin "baserom.gba", 0x4632D0, 0x4
gUnknown_84632D4:: @ 84632D4
.incbin "baserom.gba", 0x4632D4, 0x4
gUnknown_84632D8:: @ 84632D8
.incbin "baserom.gba", 0x4632D8, 0x18
gUnknown_84632F0:: @ 84632F0
.incbin "baserom.gba", 0x4632F0, 0x18
gUnknown_8463308:: @ 8463308
.incbin "baserom.gba", 0x463308, 0x20
gUnknown_8463328:: @ 8463328
.incbin "baserom.gba", 0x463328, 0x70
gUnknown_8463398:: @ 8463398
.incbin "baserom.gba", 0x463398, 0x40
gUnknown_84633D8:: @ 84633D8
.incbin "baserom.gba", 0x4633D8, 0x44
data/palette.s
+13 -2
View File
@@ -1,7 +1,18 @@
.section .rodata
.align 2
gUnknown_83AC960:: @ 83AC960
.incbin "baserom.gba", 0x3AC960, 0x10
.2byte 0xFFFF
.align 2
.4byte 0
.2byte 0
.byte 0, 0x20, 0
.align 2
gUnknown_83AC970:: @ 83AC970
.incbin "baserom.gba", 0x3AC970, 0x20
.byte 0, 0, 0, 0, 0
.byte 5, 5, 5, 5, 5
.byte 11, 11, 11, 11, 11
.byte 16, 16, 16, 16, 16
.byte 21, 21, 21, 21, 21
.byte 27, 27, 27, 27, 27
.byte 31, 31
data/specials.inc
+13 -13
View File
@@ -139,7 +139,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special sub_80BDB1C
def_special nullsub_75
def_special sub_809A540
def_special RegisteredItemHandleBikeSwap
def_special CalculatePlayerPartyCount
def_special CountPartyNonEggMons
def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
@@ -162,7 +162,7 @@ gSpecials:: @ 815FD60
def_special sub_80CA758
def_special nullsub_75
def_special nullsub_75
def_special sub_8055DC4
def_special Overworld_PlaySpecialMapMusic
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -205,7 +205,7 @@ gSpecials:: @ 815FD60
def_special ScriptHatchMon
def_special EggHatch
def_special sub_8046EAC
def_special sub_80CD228
def_special Special_BattleRecords
def_special IsEnoughForCostInVar0x8005
def_special SubtractMoneyFromVar0x8005
def_special ExecuteWhiteOut
@@ -214,8 +214,8 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sub_80A0EC4
def_special sub_80A0EEC
def_special EnterSafariMode
def_special ExitSafariMode
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -271,8 +271,8 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
def_special sp109_CreatePCMenu
def_special sub_80CA574
def_special ScrSpecial_CreatePCMenu
def_special HallOfFamePCBeginFade
def_special sub_80CA618
def_special nullsub_75
def_special nullsub_75
@@ -296,7 +296,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special sub_80CAAAC
def_special sub_80CAABC
def_special player_get_direction_lower_nybble
def_special GetPlayerFacingDirection
def_special nullsub_75
def_special nullsub_75
def_special nullsub_75
@@ -410,7 +410,7 @@ gSpecials:: @ 815FD60
def_special sub_8127888
def_special sub_80803FC
def_special sub_812B35C
def_special sub_815D334
def_special Special_SSAnneDepartureCutscene
def_special sub_8149A18
def_special sub_806E25C
def_special sub_815D9E8
@@ -420,7 +420,7 @@ gSpecials:: @ 815FD60
def_special sub_812B478
def_special sub_812B484
def_special sub_810B82C
def_special sub_8099FAC
def_special CheckHasAtLeastOneBerry
def_special sub_815F094
def_special sub_815F114
def_special sub_815EEB0
@@ -435,13 +435,13 @@ gSpecials:: @ 815FD60
def_special sub_809D764
def_special sub_809D8C0
def_special sub_8147500
def_special player_get_direction_lower_nybble
def_special GetPlayerFacingDirection
def_special sub_80CCDFC
def_special sub_80CD008
def_special sub_8147594
def_special sub_80CD034
def_special sub_815D834
def_special sub_8088F84
def_special HasAllKantoMons
def_special sub_80CD074
def_special sub_80CD098
def_special sub_811B15C
@@ -452,5 +452,5 @@ gSpecials:: @ 815FD60
def_special sub_80CB328
def_special sub_80CD154
def_special sub_80CD1B4
def_special sub_8044838
def_special CreateObedientEnemyMon
gSpecialsEnd::
data/strings.s
+4149
View File
File diff suppressed because it is too large Load Diff
data/text/help_system.inc
+1879
View File
File diff suppressed because it is too large Load Diff
data/text/move_descriptions.inc
+354 -357
View File
File diff suppressed because it is too large Load Diff
data/text/teachy_tv.inc
+227
View File
@@ -0,0 +1,227 @@
gTeachyTvString_TeachBattle:: @ 841B7A4
.string "Teach me how to battle.$"
gTeachyTvString_StatusProblems:: @ 841B7BC
.string "What are status problems?$"
gTeachyTvString_TypeMatchups:: @ 841B7D6
.string "What are type matchups?$"
gTeachyTvString_CatchPkmn:: @ 841B7EE
.string "I want to catch POKéMON.$"
gTeachyTvString_AboutTMs:: @ 841B807
.string "Teach me about TMs.$"
gTeachyTvString_RegisterItem:: @ 841B81B
.string "How do I register an item?$"
gTeachyTvString_Cancel:: @ 841B836
.string "CANCEL$"
gTeachyTvText_PokeDudeSaysHello:: @ 841B83D
.string "Hey, all you TRAINERS out there!\n"
.string "HELLO, TRAINERS!\p"
.string "……… ……… ………\p"
.string "Come on, let me hear you!\n"
.string "HELLO, TRAINERS!\l"
.string "It's me, the POKé DUDE!\p"
.string "$"
gTeachyTvText_BattleScript1:: @ 841B8BF
.string "Today, the POKé DUDE's here to\n"
.string "tell you about how you can battle\l"
.string "POKéMON!\p"
.string "Say you're out for a stroll when,\n"
.string "suddenly, a wild POKéMON appears!\p"
.string "It's up to you to smartly use your\n"
.string "POKéMON and their moves to reduce\l"
.string "the opponent's HP to nothing, and\l"
.string "claim victory!\p"
.string "I'll show you how to do that in\n"
.string "person and for sure!\p"
.string "All righty, here goes!\p"
.string "Keep your eyes glued to the super\n"
.string "POKé DUDE SHOW!$"
gTeachyTvText_BattleScript2:: @ 841BA41
.string "Well, did you get that?\p"
.string "Even if your own POKéMON's HP\n"
.string "falls to zero, and it becomes\l"
.string "unable to battle, not to worry!\p"
.string "Just take it to any POKéMON\n"
.string "CENTER and heal it!\p"
.string "All righty, be seeing you!\p"
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
gTeachyTvText_StatusScript1:: @ 841BB40
.string "Today, the POKé DUDE's here to\n"
.string "tell you about status problems!\p"
.string "Status problems include poisoning,\n"
.string "paralysis, sleep, burn…\p"
.string "There are a couple others, but\n"
.string "they really are trouble.\p"
.string "Get any one, and your POKéMON\n"
.string "may become useless in battle.\p"
.string "You know, it hurts the POKé DUDE\n"
.string "to see a POKéMON suffer…\p"
.string "So, what should you do if your\n"
.string "POKéMON gets a status problem?\p"
.string "Well, you've got me to show you!\p"
.string "All righty, here goes!\p"
.string "Keep your eyes glued to the super\n"
.string "POKé DUDE SHOW!$"
gTeachyTvText_StatusScript2:: @ 841BD10
.string "Poisoning or paralysis don't go\n"
.string "away after a battle.\p"
.string "If a POKéMON is poisoned, it loses\n"
.string "HP even while you're walking.\p"
.string "You should heal POKéMON of these\n"
.string "kinds of problems right away.\p"
.string "Use an item, or try to get to a\n"
.string "POKéMON CENTER for healing.\p"
.string "That wasn't hard, was it?\n"
.string "All righty, be seeing you!\p"
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
gTeachyTvText_MatchupsScript1:: @ 841BE76
.string "Does everyone know about type\n"
.string "matchups?\p"
.string "POKéMON and their moves all\n"
.string "belong to certain types.\p"
.string "For example, there are such types\n"
.string "as GRASS and WATER.\p"
.string "You need to consider the type of\n"
.string "the move used to attack…\p"
.string "And, the type of the POKéMON that\n"
.string "is hit by that attack.\p"
.string "Depending on how those two types\n"
.string "match up, the damage can change.\p"
.string "You see, it depends on whether\n"
.string "the type matchup is good or bad.\p"
.string "If you don't know how matchups\n"
.string "work, battles will be tough.\p"
.string "So, let me demonstrate exactly\n"
.string "what I mean.\p"
.string "All righty, here goes!\p"
.string "Keep your eyes glued to the super\n"
.string "POKé DUDE SHOW!$"
gTeachyTvText_MatchupsScript2:: @ 841C0AF
.string "Is it possible to launch an attack\n"
.string "that will inflict heavy damage?\p"
.string "Does the opposing POKéMON pose\n"
.string "a threat to your POKéMON?\p"
.string "Is there any chance that it may\n"
.string "have disastrously tough moves?\p"
.string "Watch the type matchups to gain\n"
.string "the upper hand!\p"
.string "All righty, be seeing you!\p"
.string "Oh, for the COOL-type POKé DUDE,\n"
.string "AWESOME-type kids like you match\l"
.string "up perfectly!\p"
.string "Remember, a good deed a day\n"
.string "brings happiness to stay!$"
gTeachyTvText_CatchingScript1:: @ 841C23B
.string "Today, the POKé DUDE's going to\n"
.string "show you how to catch POKéMON!\p"
.string "Just imagine… A groovy POKéMON\n"
.string "suddenly appearing in the wild!\p"
.string "Oh, you want it!\n"
.string "You just can't help it!\p"
.string "Oh, you have to catch it!\n"
.string "You gotta have it!\p"
.string "Let me show you how you can make\n"
.string "it happen!\p"
.string "All righty, here goes!\p"
.string "Keep your eyes glued to the super\n"
.string "POKé DUDE SHOW!$"
gTeachyTvText_CatchingScript2:: @ 841C384
.string "If your first POKé BALL fails to\n"
.string "catch the POKéMON, don't give up!\p"
.string "Keep throwing POKé BALLS…\n"
.string "It's bound to work sometime!\p"
.string "All righty, be seeing you!\p"
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
gTeachyTvText_TMsScript1:: @ 841C459
.string "Hey, everyone!\n"
.string "Do you all have TMs?\p"
.string "A TM, Technical Machine, is an\n"
.string "amazingly great item!\p"
.string "It teaches POKéMON a move that\n"
.string "it may not learn when leveling up!\p"
.string "Isn't that just great? What a\n"
.string "convenient world we live in!\p"
.string "Open the TM CASE and check out\n"
.string "the TMs you have.\p"
.string "You can check them out in detail,\n"
.string "too.$"
gPokeDudeText_TMTypes:: @ 841C587
.string "POKé DUDE: NORMAL, WATER, GRASS…\n"
.string "TMs also come in types.\p"
.string "Check the type and teach it to\n"
.string "a POKéMON that matches up well.\p"
.string "For example, WATER PULSE is\n"
.string "suitable for WATER-type POKéMON.\p"
.string "BULLET SEED is a move that most\n"
.string "GRASS-type POKéMON can learn.\p"
.string "There's one other thing!$"
gPokeDudeText_ReadTMDescription:: @ 841C693
.string "Don't just look at the type, read\n"
.string "the description, too.\p"
.string "It will contain hints about what\n"
.string "POKéMON might learn the move.\p"
.string "For example, take a move like\n"
.string "FOCUS PUNCH.\p"
.string "It doesn't sound like anything a\n"
.string "bird or fish POKéMON can learn.\p"
.string "So, try using it on POKéMON with\n"
.string "arms that can throw punches!$"
gTeachyTvText_TMsScript2:: @ 841C7B4
.string "Wow, I talked a lot today!\n"
.string "All righty, be seeing you!\p"
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
gTeachyTvText_RegisterScript1:: @ 841C82A
.string "A TRAINER's BAG has a bunch of\n"
.string "nifty, convenient features!\p"
.string "Take stuff in the KEY ITEMS\n"
.string "POCKET, for instance.\p"
.string "You can use a key item without\n"
.string "opening the BAG every time.\p"
.string "For example, let's pretend I have\n"
.string "a TEACHY TV in my BAG.\p"
.string "I can register it for instant use,\n"
.string "and I'll show you how!\p"
.string "All righty, here goes!\p"
.string "Keep your eyes glued to the sorta\n"
.string "super POKé DUDE SHOW!$"
gTeachyTvText_RegisterScript2:: @ 841C994
.string "And now, your TEACHY TV is\n"
.string "registered.\p"
.string "How do you use it?\n"
.string "Well, here's how it works.\p"
.string "Once an item in the KEY ITEMS\n"
.string "POKCET is registered, you can use\l"
.string "it by pressing SELECT.\p"
.string "So, you've given yourself\n"
.string "one-touch access to TEACHY TV.\p"
.string "All it takes for you to see me is\n"
.string "pressing one button!\p"
.string "That kind of attention is a little\n"
.string "embarrassing!\p"
.string "All righty, be seeing you!\p"
.string "Remember, TRAINERS, a good deed\n"
.string "a day brings happiness to stay!$"
data/unk_text_util.s
-5
View File
@@ -1,5 +0,0 @@
.section .rodata
.align 2
gUnknown_8464300:: @ 8464300
.incbin "baserom.gba", 0x464300, 0x4C