diff options
| -rw-r--r-- | data/data2.s | 14 | ||||
| -rw-r--r-- | data/graphics.s | 48 | ||||
| -rw-r--r-- | data/trainers.s | 4 |
3 files changed, 33 insertions, 33 deletions
diff --git a/data/data2.s b/data/data2.s index 26383c4aa..ef3f2b539 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1155,7 +1155,7 @@ gUnknown_08209AD4:: @ 8209AD4 .incbin "graphics/pokemon/egg/palette.gbapal" .incbin "graphics/pokemon/egg/egg_hatch.4bpp" .incbin "graphics/pokemon/egg/egg_crumble.4bpp" - + .space 2 .incbin "baserom.gba", 0x0020A37A, 0x36 @@ -1454,8 +1454,8 @@ gUnknown_0820C341:: @ 820C341 .string "システムメッセージADD$", 13 .string "はいけいセット$", 13 - @ Shedinja's Japanese name - @ sub_8048D44 compares a pokemon name with this string +@ Shedinja's Japanese name +@ sub_8048D44 compares a pokemon name with this string gUnknown_0820C3B0:: @ 820C3B0 .string "ヌケニン$" @@ -1482,7 +1482,7 @@ gUnknown_0820DD98:: @ 820DD98 .incbin "graphics/unknown/unknown_20DD98.8bpp" @ unused? gUnknown_0820F798:: @ 820F798 - .incbin "baserom.gba", 0x0020f798, 0x1000 + .incbin "baserom.gba", 0x0020f798, 0x1000 gUnknown_08210798:: @ 8210798 .incbin "baserom.gba", 0x00210798, 0x1000 @ debug? @@ -6860,7 +6860,7 @@ gUnknown_083BBCA0:: @ 83BBCA0 .4byte PCText_PokeCenter .4byte PCText_Machine .4byte PCText_Plain - + @ 83BBD20 .include "data/graphics/pokemon/icon_table.s" @@ -18301,7 +18301,7 @@ gUnknown_0840E740:: @ 840E740 .4byte OtherText_TheField .4byte OtherText_TheField2 .4byte OtherText_ThePC - + gUnknown_0840E75C:: @ 840E75C OtherText_ReturnTo: .string "Return to$" @@ -20151,7 +20151,7 @@ SystemText_ClockAdjustmentUsable: gUnknown_08411905:: @ 8411905 SystemText_Saving: - .string "SAVING...\nDON’T TURN OFF THE POWER.$" + .string "SAVING...\nDON’T TURN OFF THE POWER.$" .align 2 gUnknown_0841192C:: @ 841192C diff --git a/data/graphics.s b/data/graphics.s index b3accb9c2..b4e69e99a 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -23,73 +23,73 @@ gUnknown_08D00524:: @ 8D00524 gInterfaceGfx_PokeBall:: .incbin "graphics/interface/ball/poke.4bpp.lz" @ 0xBC - + gInterfacePal_PokeBall:: .incbin "graphics/interface/ball/poke.gbapal.lz" - + gInterfaceGfx_GreatBall:: .incbin "graphics/interface/ball/great.4bpp.lz" @ 0xBC - + gInterfacePal_GreatBall:: .incbin "graphics/interface/ball/great.gbapal.lz" - + gInterfaceGfx_SafariBall:: .incbin "graphics/interface/ball/safari.4bpp.lz" @ 0xBC - + gInterfacePal_SafariBall:: .incbin "graphics/interface/ball/safari.gbapal.lz" - + gInterfaceGfx_UltraBall:: .incbin "graphics/interface/ball/ultra.4bpp.lz" @ 0xBC - + gInterfacePal_UltraBall:: .incbin "graphics/interface/ball/ultra.gbapal.lz" - + gInterfaceGfx_MasterBall:: .incbin "graphics/interface/ball/master.4bpp.lz" @ 0xBC - + gInterfacePal_MasterBall:: .incbin "graphics/interface/ball/master.gbapal.lz" - + gInterfaceGfx_NetBall:: .incbin "graphics/interface/ball/net.4bpp.lz" @ 0xBC - + gInterfacePal_NetBall:: .incbin "graphics/interface/ball/net.gbapal.lz" - + gInterfaceGfx_DiveBall:: .incbin "graphics/interface/ball/dive.4bpp.lz" @ 0xBC - + gInterfacePal_DiveBall:: .incbin "graphics/interface/ball/dive.gbapal.lz" - + gInterfaceGfx_NestBall:: .incbin "graphics/interface/ball/nest.4bpp.lz" @ 0xBC - + gInterfacePal_NestBall:: .incbin "graphics/interface/ball/nest.gbapal.lz" - + gInterfaceGfx_RepeatBall:: .incbin "graphics/interface/ball/repeat.4bpp.lz" @ 0xBC - + gInterfacePal_RepeatBall:: .incbin "graphics/interface/ball/repeat.gbapal.lz" - + gInterfaceGfx_TimerBall:: .incbin "graphics/interface/ball/timer.4bpp.lz" @ 0xBC - + gInterfacePal_TimerBall:: .incbin "graphics/interface/ball/timer.gbapal.lz" - + gInterfaceGfx_LuxuryBall:: .incbin "graphics/interface/ball/luxury.4bpp.lz" @ 0xBC - + gInterfacePal_LuxuryBall:: .incbin "graphics/interface/ball/luxury.gbapal.lz" - + gInterfaceGfx_PremierBall:: .incbin "graphics/interface/ball/premier.4bpp.lz" @ 0xBC - + gInterfacePal_PremierBall:: .incbin "graphics/interface/ball/premier.gbapal.lz" @@ -2842,7 +2842,7 @@ gUnknown_08E8A1C2:: @ 8E8A1C2 .incbin "baserom.gba", 0x00e8a1c2, 0x1e gUnknown_08E8A1E0:: @ 8E8A1E0 - .incbin "baserom.gba", 0x00e8a1e0, 0x3b8 + .incbin "baserom.gba", 0x00e8a1e0, 0x3b8 .incbin "graphics/pokenav/contest_pokeball.gbapal" .incbin "baserom.gba", 0x00E8A5B8, 0x20 diff --git a/data/trainers.s b/data/trainers.s index 3bc1ac1e6..8e80cd77f 100644 --- a/data/trainers.s +++ b/data/trainers.s @@ -708,7 +708,7 @@ gTrainers:: @ 81F04FC .4byte 1 @ party size .4byte gTrainerParty_Carmen -@ GWEN +@ GWEN .byte 0 @ party type flags .byte TRAINER_CLASS_NAME_TUBER_F .byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music @@ -718,7 +718,7 @@ gTrainers:: @ 81F04FC .4byte FALSE @ is double battle .4byte 0x1 @ AI flags .4byte 1 @ party size - .4byte gTrainerParty_Gwen + .4byte gTrainerParty_Gwen @ LOLA_2 .byte 0 @ party type flags |