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

Merge branch 'master' into battle

Browse Source
This commit is contained in:
PikalaxALT
2019-09-25 13:49:16 -04:00
committed by GitHub
parent 2599dac8ac 6539884c88
commit 0e217e22d8
67 changed files with 3363 additions and 3782 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_setup.s
+2 -2
View File
@@ -2107,12 +2107,12 @@ sub_80806C8: @ 80806C8
push {lr}
cmp r0, 0
bne _080806D0
ldr r0, _080806D4 @ =gUnknown_84161CD
ldr r0, _080806D4 @ =gString_Dummy
_080806D0:
pop {r1}
bx r1
.align 2, 0
_080806D4: .4byte gUnknown_84161CD
_080806D4: .4byte gString_Dummy
thumb_func_end sub_80806C8
thumb_func_start sub_80806D8
asm/credits.s
-2222
View File
File diff suppressed because it is too large Load Diff
asm/field_weather.s
+3 -3
View File
@@ -1737,8 +1737,8 @@ _0807A93C: .4byte 0x000006ca
_0807A940: .4byte 0x000006cb
thumb_func_end fade_screen
thumb_func_start sub_807A944
sub_807A944: @ 807A944
thumb_func_start FieldWeather_StartFadingOutCreditsMap
FieldWeather_StartFadingOutCreditsMap: @ 807A944
push {r4-r6,lr}
sub sp, 0x4
adds r6, r2, 0
@@ -1887,7 +1887,7 @@ _0807AA60: .4byte gUnknown_2037F34
_0807AA64: .4byte 0x000006c6
_0807AA68: .4byte 0x000006ca
_0807AA6C: .4byte 0x000006cb
thumb_func_end sub_807A944
thumb_func_end FieldWeather_StartFadingOutCreditsMap
thumb_func_start sub_807AA70
sub_807AA70: @ 807AA70
asm/hall_of_fame.s
+5 -5
View File
@@ -138,7 +138,7 @@ _080F1EC4:
bne _080F1EF0
ldr r0, _080F1EEC @ =sub_80F1DC0
bl SetMainCallback2
movs r0, 0x8F
movs r0, 0x8F @ BGM_FRLG_CONGRATULATIONS_HALL_OF_FAME >> 1
lsls r0, 1
bl PlayBGM
movs r0, 0
@@ -1448,15 +1448,15 @@ sub_80F2934: @ 80F2934
movs r0, 0x80
lsls r0, 7
bl FlagSet
ldr r1, _080F2974 @ =gUnknown_2031DD8
ldr r1, _080F2974 @ =gDisableMapMusicChangeOnMapLoad
movs r0, 0x2
strb r0, [r1]
movs r2, 0x1
negs r2, r2
movs r0, 0x6
str r0, [sp]
movs r0, 0x3
movs r1, 0x9
movs r0, 0x3 @ MAP_GROUP(INDIGO_PLATEAU_EXTERIOR)
movs r1, 0x9 @ MAP_NUM(INDIGO_PLATEAU_EXTERIOR)
movs r3, 0xB
bl Overworld_SetWarpDestination
bl DoWarp
@@ -1466,7 +1466,7 @@ sub_80F2934: @ 80F2934
bx r0
.align 2, 0
_080F2970: .4byte 0x00004085
_080F2974: .4byte gUnknown_2031DD8
_080F2974: .4byte gDisableMapMusicChangeOnMapLoad
thumb_func_end sub_80F2934
thumb_func_start sub_80F2978
asm/overworld.s
+13 -13
View File
@@ -2382,14 +2382,14 @@ sub_8055DB8: @ 8055DB8
Overworld_PlaySpecialMapMusic: @ 8055DC4
push {r4,r5,lr}
sub sp, 0x4
ldr r0, _08055DD8 @ =gUnknown_2031DD8
ldr r0, _08055DD8 @ =gDisableMapMusicChangeOnMapLoad
ldrb r0, [r0]
cmp r0, 0x1
bne _08055DDC
bl StopMapMusic
b _08055E6C
.align 2, 0
_08055DD8: .4byte gUnknown_2031DD8
_08055DD8: .4byte gDisableMapMusicChangeOnMapLoad
_08055DDC:
cmp r0, 0x2
beq _08055E6C
@@ -2488,14 +2488,14 @@ _08055E90: .4byte gSaveBlock1Ptr
thumb_func_start sub_8055E94
sub_8055E94: @ 8055E94
push {r4-r6,lr}
ldr r0, _08055EA4 @ =gUnknown_2031DD8
ldr r0, _08055EA4 @ =gDisableMapMusicChangeOnMapLoad
ldrb r0, [r0]
cmp r0, 0x1
bne _08055EA8
bl StopMapMusic
b _08055F14
.align 2, 0
_08055EA4: .4byte gUnknown_2031DD8
_08055EA4: .4byte gDisableMapMusicChangeOnMapLoad
_08055EA8:
cmp r0, 0x2
beq _08055F14
@@ -2701,7 +2701,7 @@ _08056014:
adds r0, 0x32
lsls r0, 24
lsrs r2, r0, 24
ldr r0, _08056050 @ =gUnknown_2031DD8
ldr r0, _08056050 @ =gDisableMapMusicChangeOnMapLoad
ldrb r0, [r0]
cmp r0, 0x1
bne _08056054
@@ -2709,7 +2709,7 @@ _08056014:
b _0805606A
.align 2, 0
_0805604C: .4byte gUnknown_2031DDC
_08056050: .4byte gUnknown_2031DD8
_08056050: .4byte gDisableMapMusicChangeOnMapLoad
_08056054:
cmp r0, 0x2
beq _0805606A
@@ -5158,8 +5158,8 @@ _0805749A:
_080574A0: .4byte sub_8056534
thumb_func_end sub_8057430
thumb_func_start sub_80574A4
sub_80574A4: @ 80574A4
thumb_func_start Overworld_CreditsMainCB
Overworld_CreditsMainCB: @ 80574A4
push {r4,lr}
ldr r0, _080574E8 @ =gPaletteFade
ldrb r0, [r0, 0x7]
@@ -5187,7 +5187,7 @@ _080574E0:
bx r0
.align 2, 0
_080574E8: .4byte gPaletteFade
thumb_func_end sub_80574A4
thumb_func_end Overworld_CreditsMainCB
thumb_func_start sub_80574EC
sub_80574EC: @ 80574EC
@@ -5209,8 +5209,8 @@ _08057506:
bx r1
thumb_func_end sub_80574EC
thumb_func_start sub_805750C
sub_805750C: @ 805750C
thumb_func_start Overworld_DoScrollSceneForCredits
Overworld_DoScrollSceneForCredits: @ 805750C
push {lr}
ldr r3, _08057520 @ =gUnknown_2031DE4
str r1, [r3]
@@ -5223,7 +5223,7 @@ sub_805750C: @ 805750C
.align 2, 0
_08057520: .4byte gUnknown_2031DE4
_08057524: .4byte gUnknown_2036E28
thumb_func_end sub_805750C
thumb_func_end Overworld_DoScrollSceneForCredits
thumb_func_start sub_8057528
sub_8057528: @ 8057528
@@ -5451,7 +5451,7 @@ _08057712:
ldr r2, _08057738 @ =0x3fffffff
movs r0, 0
movs r1, 0
bl sub_807A944
bl FieldWeather_StartFadingOutCreditsMap
_0805772A:
ldrb r0, [r4]
adds r0, 0x1
asm/pokedex_screen.s
+1 -1
View File
@@ -4491,7 +4491,7 @@ sub_81049FC: @ 81049FC
adds r0, r5, 0
movs r1, 0x8
movs r3, 0x1
bl sub_810C228
bl LoadMonPicForCredits
add sp, 0x8
pop {r4-r6}
pop {r0}
asm/pokemon_summary_screen.s
+3 -3
View File
@@ -3476,7 +3476,7 @@ _0813622C:
ldr r0, [r6]
ldr r2, _08136308 @ =0x00003084
adds r0, r2
ldr r1, _0813630C @ =gUnknown_84161CD
ldr r1, _0813630C @ =gString_Dummy
bl StringCopy
_08136238:
cmp r4, 0x20
@@ -3498,7 +3498,7 @@ _08136240:
ldr r0, [r5]
ldr r1, _08136308 @ =0x00003084
adds r0, r1
ldr r1, _0813630C @ =gUnknown_84161CD
ldr r1, _0813630C @ =gString_Dummy
bl StringCopy
_08136264:
ldr r6, _08136310 @ =gUnknown_203B140
@@ -3572,7 +3572,7 @@ _08136264:
b _08136342
.align 2, 0
_08136308: .4byte 0x00003084
_0813630C: .4byte gUnknown_84161CD
_0813630C: .4byte gString_Dummy
_08136310: .4byte gUnknown_203B140
_08136314: .4byte 0x00003034
_08136318: .4byte gSpeciesNames
asm/post_battle_event_funcs.s
+3 -3
View File
@@ -5,8 +5,8 @@
.text
thumb_func_start sub_80CA2E4
sub_80CA2E4: @ 80CA2E4
thumb_func_start Special_HallOfFame
Special_HallOfFame: @ 80CA2E4
push {r4-r7,lr}
sub sp, 0x4
bl sp000_heal_pokemon
@@ -104,7 +104,7 @@ _080CA3B4: .4byte gSaveBlock2Ptr
_080CA3B8: .4byte gPlayerParty
_080CA3BC: .4byte 0x0000083b
_080CA3C0: .4byte CB2_DoHallOfFameScreen
thumb_func_end sub_80CA2E4
thumb_func_end Special_HallOfFame
thumb_func_start sub_80CA3C4
sub_80CA3C4: @ 80CA3C4
baserom.ips
BIN
View File
Binary file not shown.
data/credits/unk_840C630.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
255 255 255
data/credits/unk_840C650.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

data/credits/unk_840CA54.bin
BIN
View File
Binary file not shown.
data/credits/unk_840CB8C.bin
BIN
View File
Binary file not shown.
data/credits/unk_840D228.bin
BIN
View File
Binary file not shown.
data/credits/unk_840DC0C.bin
BIN
View File
Binary file not shown.
data/credits/unk_840E158.bin
BIN
View File
Binary file not shown.
data/credits/unk_840E904.bin
BIN
View File
Binary file not shown.
data/credits/unk_840F240.bin
BIN
View File
Binary file not shown.
data/credits/unk_840F944.bin
BIN
View File
Binary file not shown.
data/credits/unk_8410198.bin
BIN
View File
Binary file not shown.
data/credits/unk_84105B4.bin
BIN
View File
Binary file not shown.
data/credits/unk_8410B20.bin
BIN
View File
Binary file not shown.
data/credits/unk_8410B20.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 218 B

data/credits/unk_8410E10.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
57 57 123
172 123 65
255 197 148
222 148 115
123 65 65
82 106 156
57 57 123
115 164 197
123 123 131
238 238 255
180 180 213
255 106 74
197 57 57
255 222 90
213 180 74
0 0 0
data/credits/unk_8410E30.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

data/credits/unk_8411BF8.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
57 57 123
172 123 65
255 197 148
222 148 115
123 65 65
82 106 156
57 57 123
115 164 197
123 123 131
238 238 255
180 180 213
255 106 74
197 57 57
255 222 90
213 180 74
0 0 0
data/credits/unk_8411C18.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

data/credits/unk_84129A0.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
49 49 49
255 222 205
238 180 148
197 139 106
106 74 74
222 164 74
197 123 8
49 65 82
205 139 255
115 82 131
156 106 172
106 123 131
197 205 180
238 74 24
255 255 255
0 0 0
data/credits/unk_84129C0.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

data/credits/unk_8413318.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
131 197 0
74 139 0
32 115 0
0 82 0
106 172 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
data/credits/unk_8413338.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 624 B

data/credits/unk_8413854.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
189 180 98
172 164 74
156 148 49
123 115 24
222 213 131
0 0 0
0 0 0
0 0 0
0 0 0
255 0 255
data/credits/unk_8413874.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 632 B

data/credits/unk_8413D98.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
131 197 0
74 139 0
32 115 0
0 82 0
106 172 0
189 180 98
172 164 74
156 148 49
123 115 24
222 213 131
222 222 222
205 205 205
189 189 189
238 238 238
131 131 131
data/credits/unk_8413DB8.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 786 B

data/data_83FECCC.s
-119
View File
@@ -232,125 +232,6 @@ gUnknown_840C39C:: @ 840C39C
gUnknown_840C3BC:: @ 840C3BC
.incbin "baserom.gba", 0x40C3BC, 0x1E8
gUnknown_840C5A4:: @ 840C5A4
.incbin "baserom.gba", 0x40C5A4, 0xC
gUnknown_840C5B0:: @ 840C5B0
.incbin "baserom.gba", 0x40C5B0, 0x20
gUnknown_840C5D0:: @ 840C5D0
.incbin "baserom.gba", 0x40C5D0, 0x20
gUnknown_840C5F0:: @ 840C5F0
.incbin "baserom.gba", 0x40C5F0, 0x20
gUnknown_840C610:: @ 840C610
.incbin "baserom.gba", 0x40C610, 0x20
gUnknown_840C630:: @ 840C630
.incbin "baserom.gba", 0x40C630, 0x20
gUnknown_840C650:: @ 840C650
.incbin "baserom.gba", 0x40C650, 0x404
gUnknown_840CA54:: @ 840CA54
.incbin "baserom.gba", 0x40CA54, 0x138
gUnknown_840CB8C:: @ 840CB8C
.incbin "baserom.gba", 0x40CB8C, 0x69C
gUnknown_840D228:: @ 840D228
.incbin "baserom.gba", 0x40D228, 0xF30
gUnknown_840E158:: @ 840E158
.incbin "baserom.gba", 0x40E158, 0x7AC
gUnknown_840E904:: @ 840E904
.incbin "baserom.gba", 0x40E904, 0x93C
gUnknown_840F240:: @ 840F240
.incbin "baserom.gba", 0x40F240, 0x704
gUnknown_840F944:: @ 840F944
.incbin "baserom.gba", 0x40F944, 0x854
gUnknown_8410198:: @ 8410198
.incbin "baserom.gba", 0x410198, 0x41C
gUnknown_84105B4:: @ 84105B4
.incbin "baserom.gba", 0x4105B4, 0x728
gUnknown_8410CDC:: @ 8410CDC
.incbin "baserom.gba", 0x410CDC, 0x18
gUnknown_8410CF4:: @ 8410CF4
.incbin "baserom.gba", 0x410CF4, 0x10C
gUnknown_8410E00:: @ 8410E00
.incbin "baserom.gba", 0x410E00, 0x4
gUnknown_8410E04:: @ 8410E04
.incbin "baserom.gba", 0x410E04, 0x4
gUnknown_8410E08:: @ 8410E08
.incbin "baserom.gba", 0x410E08, 0x8
gUnknown_8410E10:: @ 8410E10
.incbin "baserom.gba", 0x410E10, 0x20
gUnknown_8410E30:: @ 8410E30
.incbin "baserom.gba", 0x410E30, 0xDC8
gUnknown_8411BF8:: @ 8411BF8
.incbin "baserom.gba", 0x411BF8, 0x20
gUnknown_8411C18:: @ 8411C18
.incbin "baserom.gba", 0x411C18, 0xD88
gUnknown_84129A0:: @ 84129A0
.incbin "baserom.gba", 0x4129A0, 0x20
gUnknown_84129C0:: @ 84129C0
.incbin "baserom.gba", 0x4129C0, 0x958
gUnknown_8413318:: @ 8413318
.incbin "baserom.gba", 0x413318, 0x20
gUnknown_8413338:: @ 8413338
.incbin "baserom.gba", 0x413338, 0x51C
gUnknown_8413854:: @ 8413854
.incbin "baserom.gba", 0x413854, 0x20
gUnknown_8413874:: @ 8413874
.incbin "baserom.gba", 0x413874, 0x524
gUnknown_8413D98:: @ 8413D98
.incbin "baserom.gba", 0x413D98, 0x20
gUnknown_8413DB8:: @ 8413DB8
.incbin "baserom.gba", 0x413DB8, 0x564
gUnknown_841431C:: @ 841431C
.incbin "baserom.gba", 0x41431C, 0x48
gUnknown_8414364:: @ 8414364
.incbin "baserom.gba", 0x414364, 0x54
gUnknown_84143B8:: @ 84143B8
.incbin "baserom.gba", 0x4143B8, 0x18
gUnknown_84143D0:: @ 84143D0
.incbin "baserom.gba", 0x4143D0, 0x1B8
gUnknown_8414588:: @ 8414588
.incbin "baserom.gba", 0x414588, 0x34
gUnknown_84145BC:: @ 84145BC
.incbin "baserom.gba", 0x4145BC, 0x204
@ strings
.section .rodata.841EE44
.align 2
gUnknown_841EE44:: @ 841EE44
data/graphics.s
+15 -12
View File
@@ -16346,14 +16346,17 @@ gUnknown_8EAAA10:: @ 8EAAA10
gUnknown_8EAAA6C:: @ 8EAAA6C
.incbin "baserom.gba", 0xEAAA6C, 0xAC
gUnknown_8EAAB18:: @ 8EAAB18
.incbin "baserom.gba", 0xEAAB18, 0x80 @UNKNOWN
gCreditsMonBackdropPals:: @ 8EAAB18
.incbin "graphics/credits/charizard.gbapal"
.incbin "graphics/credits/venusaur.gbapal"
.incbin "graphics/credits/blastoise.gbapal"
.incbin "graphics/credits/pikachu.gbapal"
gUnknown_8EAAB98:: @ 8EAAB98
.incbin "baserom.gba", 0xEAAB98, 0x774
gCreditsPokeballBgGfxTiles:: @ 8EAAB98
.incbin "graphics/credits/unk_8EAAB98.4bpp.lz"
gUnknown_8EAB30C:: @ 8EAB30C
.incbin "baserom.gba", 0xEAB30C, 0x3B8
gCreditsPokeballBgGfxMap:: @ 8EAB30C
.incbin "graphics/credits/unk_8EAB30C.bin.lz"
@ title_screen
gGraphics_TitleScreen_PokemonFireRedLogoPals:: @ 8EAB6C4
@@ -16389,14 +16392,14 @@ gGraphics_TitleScreen_FirePals:: @ 8EAE488
gGraphics_TitleScreen_BlankObjTiles:: @ 8EAE4A8
.incbin "graphics/title_screen/unk_8eae4a8.4bpp.lz"
gUnknown_8EAE528:: @ 8EAE528
.incbin "baserom.gba", 0xEAE528, 0x20 @UNKNOWN
gCreditsAllRightsReservedGfxPal:: @ 8EAE528
.incbin "graphics/credits/unk_8EAE548.gbapal"
gUnknown_8EAE548:: @ 8EAE548
.incbin "baserom.gba", 0xEAE548, 0x3B8
gCreditsAllRightsReservedGfxTiles:: @ 8EAE548
.incbin "graphics/credits/unk_8EAE548.4bpp.lz"
gUnknown_8EAE900:: @ 8EAE900
.incbin "baserom.gba", 0xEAE900, 0x100
gCreditsAllRightsReservedGfxMap:: @ 8EAE900
.incbin "graphics/credits/unk_8EAE548.bin.lz"
gUnknown_8EAEA00:: @ 8EAEA00
.incbin "baserom.gba", 0xEAEA00, 0x20 @UNKNOWN
data/maps/IndigoPlateau_Exterior/scripts.inc
+1 -1
View File
@@ -59,7 +59,7 @@ EventScript_167264:: @ 8167264
setvar VAR_MAP_SCENE_INDIGO_PLATEAU_EXTERIOR, 0
removeobject 1
removeobject 2
special sub_80F39B4
special Special_Credits
waitstate
releaseall
end
data/maps/PokemonLeague_HallOfFame/scripts.inc
+1 -1
View File
@@ -37,7 +37,7 @@ EventScript_162D70:: @ 8162D70
call EventScript_1A651A
setrespawn SPAWN_PALLET_TOWN
fadescreenspeed 1, 24
special sub_80CA2E4
special Special_HallOfFame
waitstate
releaseall
end
data/specials.inc
+2 -2
View File
@@ -281,7 +281,7 @@ gSpecials:: @ 815FD60
def_special nullsub_75
def_special nullsub_61
def_special DoSoftReset
def_special sub_80CA2E4
def_special Special_HallOfFame
def_special sub_80CB498
def_special nullsub_75
def_special SpawnScriptFieldObject
@@ -430,7 +430,7 @@ gSpecials:: @ 815FD60
def_special sub_814EA7C
def_special sub_80CCB94
def_special sub_80CCCF8
def_special sub_80F39B4
def_special Special_Credits
def_special sub_8153810
def_special sub_809D764
def_special sub_809D8C0
data/strings.s
+284 -199
View File
@@ -393,7 +393,7 @@ gFameCheckerText_Cancel:: @ 84161C1
gOtherText_Exit:: @ 84161C8
.string "EXIT$"
gUnknown_84161CD:: @ 84161CD
gString_Dummy:: @ 84161CD
.string "$"
gUnknown_84161CE::
@@ -3320,263 +3320,348 @@ gUnknown_841D18D:: @ 841D18D
.string "ROOFTOP$"
.align 2
gUnknown_841D198:: @ 841D198
gString_PokemonFireRed_Staff:: @ 841D198
.string "Pokémon FireRed Version\nStaff$"
gUnknown_841D1B6:: @ 0x841D1B6
.string " Pokémon LeafGreen Version\nStaff$"
.align 2
gString_PokemonLeafGreen_Staff:: @ 0x841D1B8
.string "Pokémon LeafGreen Version\nStaff$"
gUnknown_841D1D8:: @ 0x841D1D8
.align 2
gCreditsString_Director:: @ 0x841D1D8
.string "\n\nDirector\n\n\n\n$"
gUnknown_841D1E7:: @ 0x841D1E7
.string " \n\n\nJunichi Masuda\n\n\n$"
.align 2
gCreditsString_Junichi_Masuda:: @ 0x841D1E8
.string "\n\n\nJunichi Masuda\n\n\n$"
gUnknown_841D1FD:: @ 0x841D1FD
.string " \nArt Director\n\nBattle Director\n\n\n$"
.align 2
gCreditsString_Art_Director_Battle_Director:: @ 0x841D200
.string "\nArt Director\n\nBattle Director\n\n\n$"
gUnknown_841D222:: @ 0x841D222
.string " \n\nKen Sugimori\n\nShigeki Morimoto\n\n$"
.align 2
gCreditsString_Ken_Sugimori_Shigeki_Morimoto:: @ 0x841D224
.string "\n\nKen Sugimori\n\nShigeki Morimoto\n\n$"
gUnknown_841D247:: @ 0x841D247
.string " Program Leader\n\nPlanning Leader\n\nGraphic Design Leader\n\n$"
.align 2
gCreditsString_Program_Leader_Planning_Leader_Graphic_Design_Leader:: @ 0x841D248
.string "Program Leader\n\nPlanning Leader\n\nGraphic Design Leader\n\n$"
gUnknown_841D281:: @ 0x841D281
.string " \nTetsuya Watanabe\n\nKoji Nishino\n\nTakao Unno\n$"
.align 2
gCreditsString_Tetsuya_Watanabe_Koji_Nishino_Takao_Unno:: @ 0x841D284
.string "\nTetsuya Watanabe\n\nKoji Nishino\n\nTakao Unno\n$"
gUnknown_841D2B1:: @ 0x841D2B1
.string " Programmers\n\n\n\n\n$"
.align 2
gCreditsString_Programmers:: @ 0x841D2B4
.string "Programmers\n\n\n\n\n$"
gUnknown_841D2C5:: @ 0x841D2C5
.string " \nHiroyuki Nakamura\nMasao Taya\nSatoshi Nohara\nMiyuki Iwasawa\nDaisuke Goto\n$"
.align 2
gCreditsString_Hiroyuki_Nakamura_Masao_Taya_Satoshi_Nohara_Miyuki_Iwasawa_Daisuke_Goto:: @ 0x841D2C8
.string "\nHiroyuki Nakamura\nMasao Taya\nSatoshi Nohara\nMiyuki Iwasawa\nDaisuke Goto\n$"
gUnknown_841D312:: @ 0x841D312
.string " System Programmers\n\n\n\n\n\n$"
.align 2
gCreditsString_System_Programmers:: @ 0x841D314
.string "System Programmers\n\n\n\n\n\n$"
gUnknown_841D32D:: @ 0x841D32D
.string " \nTetsuya Watanabe\nAkito Mori\nHisashi Sogabe\nSousuke Tamada\n\n$"
.align 2
gCreditsString_Tetsuya_Watanabe_Akito_Mori_Hisashi_Sogabe_Sousuke_Tamada:: @ 0x841D330
.string "\nTetsuya Watanabe\nAkito Mori\nHisashi Sogabe\nSousuke Tamada\n\n$"
gUnknown_841D36D:: @ 0x841D36D
.string " Graphic Designers\n\n\n\n\n\n$"
.align 2
gCreditsString_Graphic_Designers:: @ 0x841D370
.string "Graphic Designers\n\n\n\n\n\n$"
gUnknown_841D388:: @ 0x841D388
.align 2
gCreditsString_Takao_Unno_Asuka_Iwashita_Kanako_Eo_Hiroki_Fuchino:: @ 0x841D388
.string "\nTakao Unno\nAsuka Iwashita\nKanako Eo\nHiroki Fuchino\n\n$"
gUnknown_841D3BE:: @ 0x841D3BE
.string " \nGraphic Designers\n\n\n\n\n$"
.align 2
gCreditsString_Graphic_Designers_2:: @ 0x841D3C0
.string "\nGraphic Designers\n\n\n\n\n$"
gUnknown_841D3D8:: @ 0x841D3D8
.align 2
gCreditsString_Ken_Sugimori_Hironobu_Yoshida:: @ 0x841D3D8
.string "\n\nKen Sugimori\nHironobu Yoshida\n\n\n$"
gUnknown_841D3FB:: @ 0x841D3FB
.string " \nMusic Composition\n\n\n\n\n$"
.align 2
gCreditsString_Music_Composition:: @ 0x841D3FC
.string "\nMusic Composition\n\n\n\n\n$"
gUnknown_841D414:: @ 0x841D414
.align 2
gCreditsString_Go_Ichinose_Junichi_Masuda:: @ 0x841D414
.string "\n\nGo Ichinose\nJunichi Masuda\n\n\n$"
gUnknown_841D434:: @ 0x841D434
.align 2
gCreditsString_Sound_Effects:: @ 0x841D434
.string "\n\nSound Effects\n\n\n\n$"
gUnknown_841D448:: @ 0x841D448
.align 2
gCreditsString_Go_Ichinose:: @ 0x841D448
.string "\n\n\nGo Ichinose\n\n\n$"
gUnknown_841D45A:: @ 0x841D45A
.string " \nGame Designers\n\n\n\n\n$"
.align 2
gCreditsString_Game_Designers:: @ 0x841D45C
.string "\nGame Designers\n\n\n\n\n$"
gUnknown_841D471:: @ 0x841D471
.string " \n\nJunichi Masuda\nKoji Nishino\nTetsuji Ohta\n\n$"
.align 2
gCreditsString_Junichi_Masuda_Koji_Nishino_Tetsuji_Ohta:: @ 0x841D474
.string "\n\nJunichi Masuda\nKoji Nishino\nTetsuji Ohta\n\n$"
gUnknown_841D4A1:: @ 0x841D4A1
.string " \nGame Designers\n\n\n\n\n$"
.align 2
gCreditsString_Game_Designers_2:: @ 0x841D4A4
.string "\nGame Designers\n\n\n\n\n$"
gUnknown_841D4B9:: @ 0x841D4B9
.string " \n\nHitomi Sato\nShigeru Ohmori\nTadashi Takahashi\n\n$"
.align 2
gCreditsString_Hitomi_Sato_Shigeru_Ohmori_Tadashi_Takahashi:: @ 0x841D4BC
.string "\n\nHitomi Sato\nShigeru Ohmori\nTadashi Takahashi\n\n$"
gUnknown_841D4ED:: @ 0x841D4ED
.string " \nGame Scenario\n\n\n\n\n$"
.align 2
gCreditsString_Game_Scenario:: @ 0x841D4F0
.string "\nGame Scenario\n\n\n\n\n$"
gUnknown_841D504:: @ 0x841D504
.align 2
gCreditsString_Hitomi_Sato_Satoshi_Tajiri:: @ 0x841D504
.string "\n\nHitomi Sato\nSatoshi Tajiri\n\n\n$"
gUnknown_841D524:: @ 0x841D524
.align 2
gCreditsString_Script_Designer_Map_Designer:: @ 0x841D524
.string "\nScript Designer\n\nMap Designer\n\n\n$"
gUnknown_841D546:: @ 0x841D546
.string " \n\nSatoshi Nohara\n\nShigeru Ohmori\n\n$"
.align 2
gCreditsString_Satoshi_Nohara_Shigeru_Ohmori:: @ 0x841D548
.string "\n\nSatoshi Nohara\n\nShigeru Ohmori\n\n$"
gUnknown_841D56B:: @ 0x841D56B
.string " \nParametric Designers\n\n\n\n\n$"
.align 2
gCreditsString_Parametric_Designers:: @ 0x841D56C
.string "\nParametric Designers\n\n\n\n\n$"
gUnknown_841D587:: @ 0x841D587
.string " \n\nKoji Nishino\nTetsuji Ohta\nShigeki Morimoto\n\n$"
.align 2
gCreditsString_Koji_Nishino_Tetsuji_Ohta_Shigeki_Morimoto:: @ 0x841D588
.string "\n\nKoji Nishino\nTetsuji Ohta\nShigeki Morimoto\n\n$"
gUnknown_841D5B7:: @ 0x841D5B7
.string " \n\nPOKéDEX Text\n\n\n\n$"
.align 2
gCreditsString_POKeDEX_Text:: @ 0x841D5B8
.string "\n\nPOKéDEX Text\n\n\n\n$"
gUnknown_841D5CB:: @ 0x841D5CB
.string " \n\n\nKenji Matsushima\n\n\n$"
.align 2
gCreditsString_Kenji_Matsushima:: @ 0x841D5CC
.string "\n\n\nKenji Matsushima\n\n\n$"
gUnknown_841D5E3:: @ 0x841D5E3
.string " POKéMON Designers\n\n\n\n\n\n$"
gUnknown_841D5FC:: @ 0x841D5FC
.string "\nKen Sugimori\nMotofumi Fujiwara\nShigeki Morimoto\nHironobu Yoshida\n\n$"
gUnknown_841D640:: @ 0x841D640
.align 2
gCreditsString_POKeMON_Designers:: @ 0x841D5E4
.string "POKéMON Designers\n\n\n\n\n\n$"
gUnknown_841D658:: @ 0x841D658
.align 2
gCreditsString_Ken_Sugimori_Motofumi_Fujiwara_Shigeki_Morimoto_Hironobu_Yoshida:: @ 0x841D5FC
.string "\nKen Sugimori\nMotofumi Fujiwara\nShigeki Morimoto\nHironobu Yoshida\n\n$"
.align 2
gCreditsString_POKeMON_Designers_2:: @ 0x841D640
.string "POKéMON Designers\n\n\n\n\n\n$"
.align 2
gCreditsString_Satoshi_Ohta_Asuka_Iwashita_Takao_Unno_Kanako_Eo_Aimi_Tomita:: @ 0x841D658
.string "\nSatoshi Ohta\nAsuka Iwashita\nTakao Unno\nKanako Eo\nAimi Tomita\n$"
gUnknown_841D697:: @ 0x841D697
.string " POKéMON Designers\n\n\n\n\n\n$"
.align 2
gCreditsString_POKeMON_Designers_3:: @ 0x841D698
.string "POKéMON Designers\n\n\n\n\n\n$"
gUnknown_841D6B0:: @ 0x841D6B0
.align 2
gCreditsString_Atsuko_Nishida_Muneo_Saito_Rena_Yoshikawa_Jun_Okutani:: @ 0x841D6B0
.string "\nAtsuko Nishida\nMuneo Saito\nRena Yoshikawa\nJun Okutani\n\n$"
gUnknown_841D6E9:: @ 0x841D6E9
.string " Supporting Programmers\n\n\n\n$"
.align 2
gCreditsString_Supporting_Programmers:: @ 0x841D6EC
.string "Supporting Programmers\n\n\n\n$"
gUnknown_841D707:: @ 0x841D707
.string " \nTeruyuki Yoshioka\nTakao Nakano\n\nSatoshi Mitsuhara\nDaisuke Hoshino\n$"
.align 2
gCreditsString_Teruyuki_Yoshioka_Takao_Nakano_Satoshi_Mitsuhara_Daisuke_Hoshino:: @ 0x841D708
.string "\nTeruyuki Yoshioka\nTakao Nakano\n\nSatoshi Mitsuhara\nDaisuke Hoshino\n$"
gUnknown_841D74C:: @ 0x841D74C
.align 2
gCreditsString_NCL_Product_Testing:: @ 0x841D74C
.string "\n\nNCL Product Testing\n\n\n\n$"
gUnknown_841D766:: @ 0x841D766
.string " \n\n\nNCL Super Mario Club\n\n\n$"
.align 2
gCreditsString_NCL_Super_Mario_Club:: @ 0x841D768
.string "\n\n\nNCL Super Mario Club\n\n\n$"
gUnknown_841D783:: @ 0x841D783
.string " Special Thanks\n\n\n\n\n\n$"
gUnknown_841D799:: @ 0x841D799
.string " \nHiro Nakamura\nHiroyuki Uesugi\nTeruki Murakawa\n\nKazuya Suyama\n$"
gUnknown_841D7DB:: @ 0x841D7DB
.string " Special Thanks\n\n\n\n\n\n$"
gUnknown_841D7F1:: @ 0x841D7F1
.string " \nKenji Tominaga\n\nKenjiro Ito\nTomotaka Komura\nMichiko Takizawa\n$"
gUnknown_841D833:: @ 0x841D833
.string " Special Thanks\n\n\n\n\n\n$"
gUnknown_841D849:: @ 0x841D849
.string " \nMakiko Takada\nMikiko Ohashi\nShusaku Egami\nTakanao Kondo\nRui Kawaguchi\n$"
gUnknown_841D894:: @ 0x841D894
.string "\n\nBraille Code Check\n\n\n\n$"
gUnknown_841D8AD:: @ 0x841D8AD
.string " \n\n\nJapan Braille Library\n\n\n$"
gUnknown_841D8CC:: @ 0x841D8CC
.string "Information Supervisors\n\n\n\n\n\n$"
gUnknown_841D8EA:: @ 0x841D8EA
.string " \nHiroki Enomoto\nKazuyuki Terada\nYuri Sakurai\nYumi Funasaka\nNaoko Yanase\n$"
gUnknown_841D935:: @ 0x841D935
.string " Coordinators\n\n\n\n\n\n$"
gUnknown_841D94B:: @ 0x841D94B
.string " \nAzusa Tajima\nAkira Kinashi\nKazuki Yoshihara\n\nRetsuji Nomoto\n$"
gUnknown_841D98A:: @ 0x841D98A
.string " \nTask Managers\n\n\n\n\n$"
gUnknown_841D9A0:: @ 0x841D9A0
.string "\n\nHitoshi Yamagami\nGakuji Nomoto\n\n\n$"
gUnknown_841D9C4:: @ 0x841D9C4
.string "\nProducers\n\n\n\n\n$"
gUnknown_841D9D4:: @ 0x841D9D4
.string "\n\nHiroyuki Jinnai\nTakehiro Izushi\nHiroaki Tsuru\n\n$"
gUnknown_841DA06:: @ 0x841DA06
.string " \n\nExecutive Director\n\n\n\n$"
gUnknown_841DA21:: @ 0x841DA21
.string " \n\n\nSatoshi Tajiri\n\n\n$"
gUnknown_841DA39:: @ 0x841DA39
.string " \n\nExecutive Producer\n\n\n\n$"
gUnknown_841DA55:: @ 0x841DA55
.string " \n\n\nSatoru Iwata\n\n\n$"
gUnknown_841DA6B:: @ 0x841DA6B
.string " \n\nExecutive Producer\n\n\n\n$"
gUnknown_841DA85:: @ 0x841DA85
.string " \n\n\nTsunekaz Ishihara\n\n\n$"
gUnknown_841DAA0:: @ 0x841DAA0
.string "\nEnglish Version Coordinators\n\n\n\n\n$"
gUnknown_841DAC3:: @ 0x841DAC3
.string " \n\nHiro Nakamura\nSeth McMahill\n\n\n$"
gUnknown_841DAE5:: @ 0x841DAE5
.string " \nTranslator\n\nText Editor\n\n\n$"
gUnknown_841DB04:: @ 0x841DB04
.string "\n\nNob Ogasawara\n\nTeresa Lillygren\n\n$"
gUnknown_841DB28:: @ 0x841DB28
.string "Programmers\n\n\n\n\n\n$"
gUnknown_841DB3A:: @ 0x841DB3A
.string " \nTeruki Murakawa\nSouichi Yamamoto\nYuichiro Ito\nAkira Kinashi\n\n$"
gUnknown_841DB7B:: @ 0x841DB7B
.string " \nEnvironment を Tool Programmers\n\n\n\n\n$"
gUnknown_841DBA1:: @ 0x841DBA1
.string " \n\nTeruki Murakawa\nSouichi Yamamoto\nKimiko Nakamichi\n\n$"
gUnknown_841DBDA:: @ 0x841DBDA
.string " NOA Product Testing\n\n\n\n\n\n$"
gUnknown_841DBF6:: @ 0x841DBF6
.string " \nThomas Hertzog\nKathy Huguenard\nMika Kurosawa\n\n\n$"
gUnknown_841DC29:: @ 0x841DC29
.string " Braille Code Check\n\n\n\n\n\n$"
gUnknown_841DC45:: @ 0x841DC45
.string " \nNational Federation\n{CLEAR_TO 0x13}of the Blind\nPatricia A. Maurer\nJapan Braille Library\nEuropean Blind Union\n$"
gUnknown_841DCAC:: @ 0x841DCAC
.string "\nBraille Code Check\n\n\n\n\n$"
gUnknown_841DCC5:: @ 0x841DCC5
.string " \n\nNational Information Library\n{CLEAR_TO 0x2D}Service\nMargaret Campion\n\n$"
gUnknown_841DD05:: @ 0x841DD05
.string " Special Thanks\n\n\n\n\n\n$"
gUnknown_841DD1D:: @ 0x841DD1D
.string " \nTakehiro Izushi\nMotoyasu Tojima\nHitoshi Yamagami\nHiroyuki Uesugi\n\n$"
gUnknown_841DD64:: @ 0x841DD64
.align 2
gCreditsString_Special_Thanks:: @ 0x841D784
.string "Special Thanks\n\n\n\n\n\n$"
gUnknown_841DD79:: @ 0x841DD79
.string " \nNicola Pratt-Barlow\nShellie Dow\nAnthony Howitt\nNaoko Saeki\nKyoko Onishi\n$"
.align 2
gCreditsString_Hiro_Nakamura_Hiroyuki_Uesugi_Teruki_Murakawa_Kazuya_Suyama:: @ 0x841D79C
.string "\nHiro Nakamura\nHiroyuki Uesugi\nTeruki Murakawa\n\nKazuya Suyama\n$"
gUnknown_841DDC6:: @ 0x841DDC6
.string " \nBraille Code Check\n\n\n\n\n$"
.align 2
gCreditsString_Special_Thanks_2:: @ 0x841D7DC
.string "Special Thanks\n\n\n\n\n\n$"
gUnknown_841DDE1:: @ 0x841DDE1
.string " \n\nThe Royal New Zealand\nFoundation of the Blind\nGreg Moran\n\n$"
.align 2
gCreditsString_Kenji_Tominaga_Kenjiro_Ito_Tomotaka_Komura_Michiko_Takizawa:: @ 0x841D7F4
.string "\nKenji Tominaga\n\nKenjiro Ito\nTomotaka Komura\nMichiko Takizawa\n$"
gUnknown_841DE21:: @ 0x841DE21
.string " \n\nGraphic Designer\n\n\n\n$"
.align 2
gCreditsString_Special_Thanks_3:: @ 0x841D834
.string "Special Thanks\n\n\n\n\n\n$"
gUnknown_841DE3B:: @ 0x841DE3B
.string " \n\n\nAkira Kinashi\n\n\n$"
.align 2
gCreditsString_Makiko_Takada_Mikiko_Ohashi_Shusaku_Egami_Takanao_Kondo_Rui_Kawaguchi:: @ 0x841D84C
.string "\nMakiko Takada\nMikiko Ohashi\nShusaku Egami\nTakanao Kondo\nRui Kawaguchi\n$"
.align 2
gCreditsString_Braille_Code_Check:: @ 0x841D894
.string "\n\nBraille Code Check\n\n\n\n$"
.align 2
gCreditsString_Japan_Braille_Library:: @ 0x841D8B0
.string "\n\n\nJapan Braille Library\n\n\n$"
.align 2
gCreditsString_Information_Supervisors:: @ 0x841D8CC
.string "Information Supervisors\n\n\n\n\n\n$"
.align 2
gCreditsString_Hiroki_Enomoto_Kazuyuki_Terada_Yuri_Sakurai_Yumi_Funasaka_Naoko_Yanase:: @ 0x841D8EC
.string "\nHiroki Enomoto\nKazuyuki Terada\nYuri Sakurai\nYumi Funasaka\nNaoko Yanase\n$"
.align 2
gCreditsString_Coordinators:: @ 0x841D938
.string "Coordinators\n\n\n\n\n\n$"
.align 2
gCreditsString_Azusa_Tajima_Akira_Kinashi_Kazuki_Yoshihara_Retsuji_Nomoto:: @ 0x841D94C
.string "\nAzusa Tajima\nAkira Kinashi\nKazuki Yoshihara\n\nRetsuji Nomoto\n$"
.align 2
gCreditsString_Task_Managers:: @ 0x841D98C
.string "\nTask Managers\n\n\n\n\n$"
.align 2
gCreditsString_Hitoshi_Yamagami_Gakuji_Nomoto:: @ 0x841D9A0
.string "\n\nHitoshi Yamagami\nGakuji Nomoto\n\n\n$"
.align 2
gCreditsString_Producers:: @ 0x841D9C4
.string "\nProducers\n\n\n\n\n$"
.align 2
gCreditsString_Hiroyuki_Jinnai_Takehiro_Izushi_Hiroaki_Tsuru:: @ 0x841D9D4
.string "\n\nHiroyuki Jinnai\nTakehiro Izushi\nHiroaki Tsuru\n\n$"
.align 2
gCreditsString_Executive_Director:: @ 0x841DA08
.string "\n\nExecutive Director\n\n\n\n$"
.align 2
gCreditsString_Satoshi_Tajiri:: @ 0x841DA24
.string "\n\n\nSatoshi Tajiri\n\n\n$"
.align 2
gCreditsString_Executive_Producer:: @ 0x841DA3C
.string "\n\nExecutive Producer\n\n\n\n$"
.align 2
gCreditsString_Satoru_Iwata:: @ 0x841DA58
.string "\n\n\nSatoru Iwata\n\n\n$"
.align 2
gCreditsString_Executive_Producer_2:: @ 0x841DA6C
.string "\n\nExecutive Producer\n\n\n\n$"
.align 2
gCreditsString_Tsunekaz_Ishihara:: @ 0x841DA88
.string "\n\n\nTsunekaz Ishihara\n\n\n$"
.align 2
gCreditsString_English_Version_Coordinators:: @ 0x841DAA0
.string "\nEnglish Version Coordinators\n\n\n\n\n$"
.align 2
gCreditsString_Hiro_Nakamura_Seth_McMahill:: @ 0x841DAC4
.string "\n\nHiro Nakamura\nSeth McMahill\n\n\n$"
.align 2
gCreditsString_Translator_Text_Editor:: @ 0x841DAE8
.string "\nTranslator\n\nText Editor\n\n\n$"
.align 2
gCreditsString_Nob_Ogasawara_Teresa_Lillygren:: @ 0x841DB04
.string "\n\nNob Ogasawara\n\nTeresa Lillygren\n\n$"
.align 2
gCreditsString_Programmers_2:: @ 0x841DB28
.string "Programmers\n\n\n\n\n\n$"
.align 2
gCreditsString_Teruki_Murakawa_Souichi_Yamamoto_Yuichiro_Ito_Akira_Kinashi:: @ 0x841DB3C
.string "\nTeruki Murakawa\nSouichi Yamamoto\nYuichiro Ito\nAkira Kinashi\n\n$"
.align 2
gCreditsString_Environment_Tool_Programmers:: @ 0x841DB7C
.string "\nEnvironment を Tool Programmers\n\n\n\n\n$"
.align 2
gCreditsString_Teruki_Murakawa_Souichi_Yamamoto_Kimiko_Nakamichi:: @ 0x841DBA4
.string "\n\nTeruki Murakawa\nSouichi Yamamoto\nKimiko Nakamichi\n\n$"
.align 2
gCreditsString_NOA_Product_Testing:: @ 0x841DBDC
.string "NOA Product Testing\n\n\n\n\n\n$"
.align 2
gCreditsString_Thomas_Hertzog_Kathy_Huguenard_Mika_Kurosawa:: @ 0x841DBF8
.string "\nThomas Hertzog\nKathy Huguenard\nMika Kurosawa\n\n\n$"
.align 2
gCreditsString_Braille_Code_Check_2:: @ 0x841DC2C
.string "Braille Code Check\n\n\n\n\n\n$"
.align 2
gCreditsString_National_Federation_of_the_Blind_Patricia_A_Maurer_Japan_Braille_Library_European_Blind_Union:: @ 0x841DC48
.string "\nNational Federation\n{CLEAR_TO 0x13}of the Blind\nPatricia A. Maurer\nJapan Braille Library\nEuropean Blind Union\n$"
.align 2
gCreditsString_Braille_Code_Check_3:: @ 0x841DCAC
.string "\nBraille Code Check\n\n\n\n\n$"
.align 2
gCreditsString_National_Information_Library_Service_Margaret_Campion:: @ 0x841DCC8
.string "\n\nNational Information Library\n{CLEAR_TO 0x2D}Service\nMargaret Campion\n\n$"
.align 2
gCreditsString_Special_Thanks_4:: @ 0x841DD08
.string "Special Thanks\n\n\n\n\n\n$"
.align 2
gCreditsString_Takehiro_Izushi_Motoyasu_Tojima_Hitoshi_Yamagami_Hiroyuki_Uesugi:: @ 0x841DD20
.string "\nTakehiro Izushi\nMotoyasu Tojima\nHitoshi Yamagami\nHiroyuki Uesugi\n\n$"
.align 2
gCreditsString_Special_Thanks_5:: @ 0x841DD64
.string "Special Thanks\n\n\n\n\n\n$"
.align 2
gCreditsString_Nicola_Pratt_Barlow_Shellie_Dow_Anthony_Howitt_Naoko_Saeki_Kyoko_Onishi:: @ 0x841DD7C
.string "\nNicola Pratt-Barlow\nShellie Dow\nAnthony Howitt\nNaoko Saeki\nKyoko Onishi\n$"
.align 2
gCreditsString_Braille_Code_Check_4:: @ 0x841DDC8
.string "\nBraille Code Check\n\n\n\n\n$"
.align 2
gCreditsString_The_Royal_New_Zealand_Foundation_of_the_Blind_Greg_Moran:: @ 0x841DDE4
.string "\n\nThe Royal New Zealand\nFoundation of the Blind\nGreg Moran\n\n$"
.align 2
gCreditsString_Graphic_Designer:: @ 0x841DE24
.string "\n\nGraphic Designer\n\n\n\n$"
.align 2
gCreditsString_Akira_Kinashi:: @ 0x841DE3C
.string "\n\n\nAkira Kinashi\n\n\n$"
gJPText_MysteryGift:: @ 841DE50
.string "$"
graphics/credits/blastoise.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
148 197 246
131 180 246
106 164 246
90 148 255
57 98 164
24 49 82
172 222 246
131 172 197
98 131 148
65 82 98
32 41 49
16 98 255
8 65 164
0 32 82
0 0 0
graphics/credits/charizard.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
230 98 90
213 65 82
189 32 74
172 0 74
115 0 49
57 0 24
255 131 98
197 98 74
148 74 57
98 49 32
49 24 16
255 0 8
164 0 0
82 0 0
0 0 0
graphics/credits/pikachu.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 230 57
255 213 41
255 189 16
255 172 0
164 115 0
82 57 0
255 255 82
213 213 65
180 180 57
148 148 41
106 106 32
255 90 0
164 57 0
82 24 0
0 0 0
graphics/credits/unk_8EAAB98.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

graphics/credits/unk_8EAB30C.bin
BIN
View File
Binary file not shown.
graphics/credits/unk_8EAE548.bin
BIN
View File
Binary file not shown.
graphics/credits/unk_8EAE548.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 908 B

graphics/credits/venusaur.pal
+19
View File
@@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
131 205 131
90 164 115
49 115 98
16 115 123
8 74 82
0 32 41
172 255 156
131 197 123
98 148 90
65 98 57
32 49 24
16 180 0
8 115 0
0 57 0
0 0 0
graphics_file_rules.mk
+4
View File
@@ -24,6 +24,7 @@ TEACHYTVGFXDIR := graphics/teachy_tv
SSANNEGFXDIR := graphics/ss_anne
ITEMPCGFXDIR := graphics/item_pc
TITLESCREENGFXDIR := graphics/title_screen
CREDITSGFXDIR := graphics/credits
types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
contest_types := cool beauty cute smart tough
@@ -497,3 +498,6 @@ $(ITEMPCGFXDIR)/unk_8E85090.4bpp: %.4bpp: %.png
$(TITLESCREENGFXDIR)/unk_8ead608.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 135
$(CREDITSGFXDIR)/unk_8EAE548.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 77
include/field_weather.h
+1
View File
@@ -17,5 +17,6 @@ bool8 sub_807AA70(void);
void SetWeatherScreenFadeOut(void);
void sub_807B070(void);
u8 GetCurrentWeather(void);
void FieldWeather_StartFadingOutCreditsMap(u8, u8, u32);
#endif // GUARD_WEATHER_H
include/gba/defines.h
+5
View File
@@ -6,8 +6,13 @@
#define TRUE 1
#define FALSE 0
#if defined(__APPLE__)
#define IWRAM_DATA __attribute__((section("__DATA,iwram_data")))
#define EWRAM_DATA __attribute__((section("__DATA,ewram_data")))
#else
#define IWRAM_DATA __attribute__((section("iwram_data")))
#define EWRAM_DATA __attribute__((section("ewram_data")))
#endif
#define ALIGNED(n) __attribute__((aligned(n)))
include/graphics.h
+8
View File
@@ -990,4 +990,12 @@ extern const u32 gSubstituteDollGfx[];
extern const u32 gSubstituteDollTilemap[];
extern const u32 gSubstituteDollPal[];
// credits
extern const u32 gCreditsPokeballBgGfxTiles[];
extern const u32 gCreditsPokeballBgGfxMap[];
extern const u16 gCreditsMonBackdropPals[][16];
extern const u16 gCreditsAllRightsReservedGfxPal[];
extern const u8 gCreditsAllRightsReservedGfxTiles[];
extern const u8 gCreditsAllRightsReservedGfxMap[];
#endif //GUARD_GRAPHICS_H
include/overworld.h
+19 -4
View File
@@ -1,5 +1,5 @@
#ifndef GUARD_ROM4_H
#define GUARD_ROM4_H
#ifndef GUARD_OVERWORLD_H
#define GUARD_OVERWORLD_H
#include "global.h"
#include "main.h"
@@ -23,6 +23,18 @@ struct UCoords32
u32 x, y;
};
struct CreditsOverworldCmd
{
s16 unk_0;
u16 unk_2;
u16 unk_4;
};
/* gDisableMapMusicChangeOnMapLoad */
#define MUSIC_DISABLE_OFF 0
#define MUSIC_DISABLE_STOP 1
#define MUSIC_DISABLE_KEEP 2
extern struct UCoords32 gDirectionToVectors[];
extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
@@ -98,7 +110,7 @@ void sub_8055D40(u16 mapDataId);
void CleanupOverworldWindowsAndTilemaps(void);
u32 sub_8054C04(void);
extern u8 gUnknown_2031DD8;
extern u8 gDisableMapMusicChangeOnMapLoad;
extern u8 gUnknown_2036E28;
extern void (*gFieldCallback)(void);
@@ -121,4 +133,7 @@ void Overworld_ResetStateAfterDigEscRope(void);
bool32 sub_8058244(void);
u8 GetCurrentMapType(void);
#endif //GUARD_ROM4_H
void Overworld_CreditsMainCB(void);
bool32 Overworld_DoScrollSceneForCredits(u8 *, const struct CreditsOverworldCmd *, u8);
#endif //GUARD_OVERWORLD_H
include/strings.h
+89
View File
@@ -226,4 +226,93 @@ extern const u8 gText_WhatWillPkmnDo[];
// battle_script_commands
extern const u8 gText_BattleYesNoChoice[];
// credits
extern const u8 gString_Dummy[];
extern const u8 gString_PokemonFireRed_Staff[]; // FR
extern const u8 gString_PokemonLeafGreen_Staff[]; // LG
extern const u8 gCreditsString_Director[];
extern const u8 gCreditsString_Junichi_Masuda[];
extern const u8 gCreditsString_Art_Director_Battle_Director[];
extern const u8 gCreditsString_Ken_Sugimori_Shigeki_Morimoto[];
extern const u8 gCreditsString_Program_Leader_Planning_Leader_Graphic_Design_Leader[];
extern const u8 gCreditsString_Tetsuya_Watanabe_Koji_Nishino_Takao_Unno[];
extern const u8 gCreditsString_Programmers[];
extern const u8 gCreditsString_Hiroyuki_Nakamura_Masao_Taya_Satoshi_Nohara_Miyuki_Iwasawa_Daisuke_Goto[];
extern const u8 gCreditsString_System_Programmers[];
extern const u8 gCreditsString_Tetsuya_Watanabe_Akito_Mori_Hisashi_Sogabe_Sousuke_Tamada[];
extern const u8 gCreditsString_Graphic_Designers[];
extern const u8 gCreditsString_Takao_Unno_Asuka_Iwashita_Kanako_Eo_Hiroki_Fuchino[];
extern const u8 gCreditsString_Graphic_Designers_2[];
extern const u8 gCreditsString_Ken_Sugimori_Hironobu_Yoshida[];
extern const u8 gCreditsString_Music_Composition[];
extern const u8 gCreditsString_Go_Ichinose_Junichi_Masuda[];
extern const u8 gCreditsString_Sound_Effects[];
extern const u8 gCreditsString_Go_Ichinose[];
extern const u8 gCreditsString_Game_Designers[];
extern const u8 gCreditsString_Junichi_Masuda_Koji_Nishino_Tetsuji_Ohta[];
extern const u8 gCreditsString_Game_Designers_2[];
extern const u8 gCreditsString_Hitomi_Sato_Shigeru_Ohmori_Tadashi_Takahashi[];
extern const u8 gCreditsString_Game_Scenario[];
extern const u8 gCreditsString_Hitomi_Sato_Satoshi_Tajiri[];
extern const u8 gCreditsString_Script_Designer_Map_Designer[];
extern const u8 gCreditsString_Satoshi_Nohara_Shigeru_Ohmori[];
extern const u8 gCreditsString_Parametric_Designers[];
extern const u8 gCreditsString_Koji_Nishino_Tetsuji_Ohta_Shigeki_Morimoto[];
extern const u8 gCreditsString_POKeDEX_Text[];
extern const u8 gCreditsString_Kenji_Matsushima[];
extern const u8 gCreditsString_POKeMON_Designers[];
extern const u8 gCreditsString_Ken_Sugimori_Motofumi_Fujiwara_Shigeki_Morimoto_Hironobu_Yoshida[];
extern const u8 gCreditsString_POKeMON_Designers_2[];
extern const u8 gCreditsString_Satoshi_Ohta_Asuka_Iwashita_Takao_Unno_Kanako_Eo_Aimi_Tomita[];
extern const u8 gCreditsString_POKeMON_Designers_3[];
extern const u8 gCreditsString_Atsuko_Nishida_Muneo_Saito_Rena_Yoshikawa_Jun_Okutani[];
extern const u8 gCreditsString_Supporting_Programmers[];
extern const u8 gCreditsString_Teruyuki_Yoshioka_Takao_Nakano_Satoshi_Mitsuhara_Daisuke_Hoshino[];
extern const u8 gCreditsString_NCL_Product_Testing[];
extern const u8 gCreditsString_NCL_Super_Mario_Club[];
extern const u8 gCreditsString_Special_Thanks[];
extern const u8 gCreditsString_Hiro_Nakamura_Hiroyuki_Uesugi_Teruki_Murakawa_Kazuya_Suyama[];
extern const u8 gCreditsString_Special_Thanks_2[];
extern const u8 gCreditsString_Kenji_Tominaga_Kenjiro_Ito_Tomotaka_Komura_Michiko_Takizawa[];
extern const u8 gCreditsString_Special_Thanks_3[];
extern const u8 gCreditsString_Makiko_Takada_Mikiko_Ohashi_Shusaku_Egami_Takanao_Kondo_Rui_Kawaguchi[];
extern const u8 gCreditsString_Braille_Code_Check[];
extern const u8 gCreditsString_Japan_Braille_Library[];
extern const u8 gCreditsString_Information_Supervisors[];
extern const u8 gCreditsString_Hiroki_Enomoto_Kazuyuki_Terada_Yuri_Sakurai_Yumi_Funasaka_Naoko_Yanase[];
extern const u8 gCreditsString_Coordinators[];
extern const u8 gCreditsString_Azusa_Tajima_Akira_Kinashi_Kazuki_Yoshihara_Retsuji_Nomoto[];
extern const u8 gCreditsString_Task_Managers[];
extern const u8 gCreditsString_Hitoshi_Yamagami_Gakuji_Nomoto[];
extern const u8 gCreditsString_Producers[];
extern const u8 gCreditsString_Hiroyuki_Jinnai_Takehiro_Izushi_Hiroaki_Tsuru[];
extern const u8 gCreditsString_Executive_Director[];
extern const u8 gCreditsString_Satoshi_Tajiri[];
extern const u8 gCreditsString_Executive_Producer[];
extern const u8 gCreditsString_Satoru_Iwata[];
extern const u8 gCreditsString_Executive_Producer_2[];
extern const u8 gCreditsString_Tsunekaz_Ishihara[];
extern const u8 gCreditsString_English_Version_Coordinators[];
extern const u8 gCreditsString_Hiro_Nakamura_Seth_McMahill[];
extern const u8 gCreditsString_Translator_Text_Editor[];
extern const u8 gCreditsString_Nob_Ogasawara_Teresa_Lillygren[];
extern const u8 gCreditsString_Programmers_2[];
extern const u8 gCreditsString_Teruki_Murakawa_Souichi_Yamamoto_Yuichiro_Ito_Akira_Kinashi[];
extern const u8 gCreditsString_Environment_Tool_Programmers[];
extern const u8 gCreditsString_Teruki_Murakawa_Souichi_Yamamoto_Kimiko_Nakamichi[];
extern const u8 gCreditsString_NOA_Product_Testing[];
extern const u8 gCreditsString_Thomas_Hertzog_Kathy_Huguenard_Mika_Kurosawa[];
extern const u8 gCreditsString_Braille_Code_Check_2[];
extern const u8 gCreditsString_National_Federation_of_the_Blind_Patricia_A_Maurer_Japan_Braille_Library_European_Blind_Union[];
extern const u8 gCreditsString_Braille_Code_Check_3[];
extern const u8 gCreditsString_National_Information_Library_Service_Margaret_Campion[];
extern const u8 gCreditsString_Special_Thanks_4[];
extern const u8 gCreditsString_Takehiro_Izushi_Motoyasu_Tojima_Hitoshi_Yamagami_Hiroyuki_Uesugi[];
extern const u8 gCreditsString_Special_Thanks_5[];
extern const u8 gCreditsString_Nicola_Pratt_Barlow_Shellie_Dow_Anthony_Howitt_Naoko_Saeki_Kyoko_Onishi[];
extern const u8 gCreditsString_Braille_Code_Check_4[];
extern const u8 gCreditsString_The_Royal_New_Zealand_Foundation_of_the_Blind_Greg_Moran[];
extern const u8 gCreditsString_Graphic_Designer[];
extern const u8 gCreditsString_Akira_Kinashi[];
#endif //GUARD_STRINGS_H
include/text.h
+25 -23
View File
@@ -83,7 +83,16 @@
#define TEXT_COLOR_DARK_GREY 0x2
// battle placeholders are located in battle_message.h
#define EXT_CTRL_CODE_COLOR 0x1
#define EXT_CTRL_CODE_HIGHLIGHT 0x2
#define EXT_CTRL_CODE_SHADOW 0x3
//
#define EXT_CTRL_CODE_UNKNOWN_7 0x7
//
#define EXT_CTRL_CODE_CLEAR 0x11
//
#define EXT_CTRL_CODE_CLEAR_TO 0x13
#define EXT_CTRL_CODE_MIN_LETTER_SPACING 0x14
#define EXT_CTRL_CODE_JPN 0x15
#define EXT_CTRL_CODE_ENG 0x16
@@ -105,18 +114,13 @@ enum
struct TextPrinterSubStruct
{
u8 font_type:4; // 0x14
u8 font_type_upper:1;
u8 glyphId:4; // 0x14
bool8 hasPrintBeenSpedUp:1;
u8 font_type_5:3;
u8 field_1:5;
u8 field_1_upmid:2;
u8 field_1_top:1;
u8 frames_visible_counter;
u8 field_3;
u8 field_4; // 0x18
u8 field_5;
u8 field_6;
u8 active;
u8 downArrowDelay:5;
u8 downArrowYPosIdx:2;
u8 hasGlyphIdBeenSet:1;
u8 autoScrollDelay;
};
struct TextPrinterTemplate // TODO: Better name
@@ -138,18 +142,15 @@ struct TextPrinterTemplate // TODO: Better name
struct TextPrinter
{
struct TextPrinterTemplate subPrinter;
struct TextPrinterTemplate printerTemplate;
void (*callback)(struct TextPrinterTemplate *, u16); // 0x10
union {
union __attribute__((packed)) {
struct TextPrinterSubStruct sub;
u8 sub_fields[8];
} sub_union;
u8 fields[7];
} subUnion;
u8 active;
u8 state; // 0x1C
u8 text_speed;
u8 textSpeed;
u8 delayCounter;
u8 scrollDistance;
u8 minLetterSpacing; // 0x20
@@ -173,13 +174,13 @@ extern const struct FontInfo *gFonts;
struct GlyphWidthFunc
{
u32 font_id;
u32 fontId;
s32 (*func)(u16 glyphId, bool32 isJapanese);
};
struct KeypadIcon
{
u16 tile_offset;
u16 tileOffset;
u8 width;
u8 height;
};
@@ -262,5 +263,6 @@ s32 GetGlyphWidthFont5(u16 glyphId, bool32 isJapanese);
void sub_80062B0(struct Sprite *sprite);
u8 CreateTextCursorSpriteForOakSpeech(u8 sheetId, u16 x, u16 y, u8 priority, u8 subpriority);
void sub_8006398(u8 spriteId);
s32 GetGlyphWidthFont6(u16 font_type, bool32 isJapanese);
#endif // GUARD_TEXT_H
include/trainer_pokemon_sprites.h
+1
View File
@@ -15,5 +15,6 @@ u16 CreateTrainerPicSprite(u16 species, bool8 isFrontPic, s16 x, s16 y, u8 palet
u16 FreeAndDestroyTrainerPicSprite(u16);
u16 PlayerGenderToFrontTrainerPicId_Debug(u8 gender, bool8 getClass);
u16 CreateMonPicSprite_HandleDeoxys(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 LoadMonPicForCredits(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId);
#endif // GUARD_TRAINER_POKEMON_SPRITES_H
ld_script.txt
+2 -1
View File
@@ -212,7 +212,7 @@ SECTIONS {
src/intro.o(.text);
asm/battle_anim_special.o(.text);
asm/hall_of_fame.o(.text);
asm/credits.o(.text);
src/credits.o(.text);
src/diploma.o(.text);
asm/save_failed_screen.o(.text);
asm/clear_save_data_screen.o(.text);
@@ -434,6 +434,7 @@ SECTIONS {
data/data_83FECCC.o(.rodata.83FEDE4);
src/intro.o(.rodata);
data/data_83FECCC.o(.rodata.battle_anim_special);
src/credits.o(.rodata);
src/diploma.o(.rodata);
data/strings.o(.rodata);
data/data_83FECCC.o(.rodata.841EE44);
src/braille_text.c
+43 -43
View File
@@ -17,20 +17,20 @@ u16 Font6Func(struct TextPrinter *textPrinter)
u16 char_;
struct TextPrinterSubStruct *sub;
sub = &textPrinter->sub_union.sub;
sub = &textPrinter->subUnion.sub;
switch (textPrinter->state)
{
case 0:
if (gMain.heldKeys & (A_BUTTON | B_BUTTON) && sub->font_type_upper)
if (gMain.heldKeys & (A_BUTTON | B_BUTTON) && sub->hasPrintBeenSpedUp)
{
textPrinter->delayCounter = 0;
}
if (textPrinter->delayCounter && textPrinter->text_speed)
if (textPrinter->delayCounter && textPrinter->textSpeed)
{
textPrinter->delayCounter --;
if (gTextFlags.canABSpeedUpPrint && gMain.newKeys & (A_BUTTON | B_BUTTON))
{
sub->font_type_upper = TRUE;
sub->hasPrintBeenSpedUp = TRUE;
textPrinter->delayCounter = 0;
}
return 3;
@@ -41,62 +41,62 @@ u16 Font6Func(struct TextPrinter *textPrinter)
}
else
{
textPrinter->delayCounter = textPrinter->text_speed;
textPrinter->delayCounter = textPrinter->textSpeed;
}
char_ = *textPrinter->subPrinter.currentChar++;
char_ = *textPrinter->printerTemplate.currentChar++;
switch (char_)
{
case EOS:
return 1;
case CHAR_NEWLINE:
textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
textPrinter->subPrinter.currentY += gFonts[textPrinter->subPrinter.fontId].maxLetterHeight + textPrinter->subPrinter.lineSpacing;
textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x;
textPrinter->printerTemplate.currentY += gFonts[textPrinter->printerTemplate.fontId].maxLetterHeight + textPrinter->printerTemplate.lineSpacing;
return 2;
case PLACEHOLDER_BEGIN:
textPrinter->subPrinter.currentChar++;
textPrinter->printerTemplate.currentChar++;
return 2;
case EXT_CTRL_CODE_BEGIN:
char_ = *textPrinter->subPrinter.currentChar++;
char_ = *textPrinter->printerTemplate.currentChar++;
switch (char_)
{
case 1:
textPrinter->subPrinter.fgColor = *textPrinter->subPrinter.currentChar++;
GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fgColor, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
textPrinter->printerTemplate.fgColor = *textPrinter->printerTemplate.currentChar++;
GenerateFontHalfRowLookupTable(textPrinter->printerTemplate.fgColor, textPrinter->printerTemplate.bgColor, textPrinter->printerTemplate.shadowColor);
return 2;
case 2:
textPrinter->subPrinter.bgColor = *textPrinter->subPrinter.currentChar++;
GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fgColor, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
textPrinter->printerTemplate.bgColor = *textPrinter->printerTemplate.currentChar++;
GenerateFontHalfRowLookupTable(textPrinter->printerTemplate.fgColor, textPrinter->printerTemplate.bgColor, textPrinter->printerTemplate.shadowColor);
return 2;
case 3:
textPrinter->subPrinter.shadowColor = *textPrinter->subPrinter.currentChar++;
GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fgColor, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
textPrinter->printerTemplate.shadowColor = *textPrinter->printerTemplate.currentChar++;
GenerateFontHalfRowLookupTable(textPrinter->printerTemplate.fgColor, textPrinter->printerTemplate.bgColor, textPrinter->printerTemplate.shadowColor);
return 2;
case 4:
textPrinter->subPrinter.fgColor = *textPrinter->subPrinter.currentChar;
textPrinter->subPrinter.bgColor = *++textPrinter->subPrinter.currentChar;
textPrinter->subPrinter.shadowColor = *++textPrinter->subPrinter.currentChar;
textPrinter->subPrinter.currentChar++;
textPrinter->printerTemplate.fgColor = *textPrinter->printerTemplate.currentChar;
textPrinter->printerTemplate.bgColor = *++textPrinter->printerTemplate.currentChar;
textPrinter->printerTemplate.shadowColor = *++textPrinter->printerTemplate.currentChar;
textPrinter->printerTemplate.currentChar++;
GenerateFontHalfRowLookupTable(textPrinter->subPrinter.fgColor, textPrinter->subPrinter.bgColor, textPrinter->subPrinter.shadowColor);
GenerateFontHalfRowLookupTable(textPrinter->printerTemplate.fgColor, textPrinter->printerTemplate.bgColor, textPrinter->printerTemplate.shadowColor);
return 2;
case 5:
textPrinter->subPrinter.currentChar++;
textPrinter->printerTemplate.currentChar++;
return 2;
case 6:
sub->font_type = *textPrinter->subPrinter.currentChar;
textPrinter->subPrinter.currentChar++;
sub->glyphId = *textPrinter->printerTemplate.currentChar;
textPrinter->printerTemplate.currentChar++;
return 2;
case 7:
return 2;
case 8:
textPrinter->delayCounter = *textPrinter->subPrinter.currentChar++;
textPrinter->delayCounter = *textPrinter->printerTemplate.currentChar++;
textPrinter->state = 6;
return 2;
case 9:
textPrinter->state = 1;
if (gTextFlags.autoScroll)
{
sub->frames_visible_counter = 0;
sub->autoScrollDelay = 0;
}
return 3;
case 10:
@@ -104,19 +104,19 @@ u16 Font6Func(struct TextPrinter *textPrinter)
return 3;
case 11:
case 16:
textPrinter->subPrinter.currentChar += 2;
textPrinter->printerTemplate.currentChar += 2;
return 2;
case 12:
char_ = *++textPrinter->subPrinter.currentChar;
char_ = *++textPrinter->printerTemplate.currentChar;
break;
case 13:
textPrinter->subPrinter.currentX = textPrinter->subPrinter.x + *textPrinter->subPrinter.currentChar++;
textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x + *textPrinter->printerTemplate.currentChar++;
return 2;
case 14:
textPrinter->subPrinter.currentY = textPrinter->subPrinter.y + *textPrinter->subPrinter.currentChar++;
textPrinter->printerTemplate.currentY = textPrinter->printerTemplate.y + *textPrinter->printerTemplate.currentChar++;
return 2;
case 15:
FillWindowPixelBuffer(textPrinter->subPrinter.windowId, PIXEL_FILL(textPrinter->subPrinter.bgColor));
FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PIXEL_FILL(textPrinter->printerTemplate.bgColor));
return 2;
}
break;
@@ -129,15 +129,15 @@ u16 Font6Func(struct TextPrinter *textPrinter)
TextPrinterInitDownArrowCounters(textPrinter);
return 3;
case 0xF9:
char_ = *textPrinter->subPrinter.currentChar++| 0x100;
char_ = *textPrinter->printerTemplate.currentChar++| 0x100;
break;
case 0xF8:
textPrinter->subPrinter.currentChar++;
textPrinter->printerTemplate.currentChar++;
return 0;
}
DecompressGlyphFont6(char_);
CopyGlyphToWindow(textPrinter);
textPrinter->subPrinter.currentX += gGlyphInfo[0x80] + textPrinter->subPrinter.letterSpacing;
textPrinter->printerTemplate.currentX += gGlyphInfo[0x80] + textPrinter->printerTemplate.letterSpacing;
return 0;
case 1:
if (TextPrinterWait(textPrinter))
@@ -148,9 +148,9 @@ u16 Font6Func(struct TextPrinter *textPrinter)
case 2:
if (TextPrinterWaitWithDownArrow(textPrinter))
{
FillWindowPixelBuffer(textPrinter->subPrinter.windowId, PIXEL_FILL(textPrinter->subPrinter.bgColor));
textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
textPrinter->subPrinter.currentY = textPrinter->subPrinter.y;
FillWindowPixelBuffer(textPrinter->printerTemplate.windowId, PIXEL_FILL(textPrinter->printerTemplate.bgColor));
textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x;
textPrinter->printerTemplate.currentY = textPrinter->printerTemplate.y;
textPrinter->state = 0;
}
return 3;
@@ -158,8 +158,8 @@ u16 Font6Func(struct TextPrinter *textPrinter)
if (TextPrinterWaitWithDownArrow(textPrinter))
{
TextPrinterClearDownArrow(textPrinter);
textPrinter->scrollDistance = gFonts[textPrinter->subPrinter.fontId].maxLetterHeight + textPrinter->subPrinter.lineSpacing;
textPrinter->subPrinter.currentX = textPrinter->subPrinter.x;
textPrinter->scrollDistance = gFonts[textPrinter->printerTemplate.fontId].maxLetterHeight + textPrinter->printerTemplate.lineSpacing;
textPrinter->printerTemplate.currentX = textPrinter->printerTemplate.x;
textPrinter->state = 4;
}
return 3;
@@ -168,15 +168,15 @@ u16 Font6Func(struct TextPrinter *textPrinter)
{
if (textPrinter->scrollDistance < gUnknown_846FB08[gSaveBlock2Ptr->optionsTextSpeed])
{
ScrollWindow(textPrinter->subPrinter.windowId, 0, textPrinter->scrollDistance, PIXEL_FILL(textPrinter->subPrinter.bgColor));
ScrollWindow(textPrinter->printerTemplate.windowId, 0, textPrinter->scrollDistance, PIXEL_FILL(textPrinter->printerTemplate.bgColor));
textPrinter->scrollDistance = 0;
}
else
{
ScrollWindow(textPrinter->subPrinter.windowId, 0, gUnknown_846FB08[gSaveBlock2Ptr->optionsTextSpeed], PIXEL_FILL(textPrinter->subPrinter.bgColor));
ScrollWindow(textPrinter->printerTemplate.windowId, 0, gUnknown_846FB08[gSaveBlock2Ptr->optionsTextSpeed], PIXEL_FILL(textPrinter->printerTemplate.bgColor));
textPrinter->scrollDistance -= gUnknown_846FB08[gSaveBlock2Ptr->optionsTextSpeed];
}
CopyWindowToVram(textPrinter->subPrinter.windowId, 2);
CopyWindowToVram(textPrinter->printerTemplate.windowId, 2);
}
else
{
@@ -216,7 +216,7 @@ static void DecompressGlyphFont6(u16 glyph)
gGlyphInfo[0x81] = 0x10;
}
u32 GetGlyphWidthFont6(u16 font_type, bool32 isJapanese)
s32 GetGlyphWidthFont6(u16 font_type, bool32 isJapanese)
{
return 0x10;
}
src/credits.c
+2167
View File
File diff suppressed because it is too large Load Diff
src/menu2.c
+69 -254
View File
@@ -1,5 +1,6 @@
#include "global.h"
#include "text.h"
#include "blit.h"
#include "gpu_regs.h"
#include "task.h"
#include "wild_encounter.h"
@@ -502,261 +503,75 @@ void sub_812E6DC(u8 windowId, const u8 * src, u16 x, u16 y)
}
}
// Yeah, no, I'm not bothering with this
NAKED
static void sub_812E768(void * a0, void * a1, u16 a2, u16 a3, u16 a4, u16 a5, u16 a6, u16 a7)
static void sub_812E768(const struct Bitmap *src, struct Bitmap *dst, u16 srcX, u16 srcY, u16 dstX, u16 dstY, u16 width, u16 height)
{
asm_unified("\tpush {r4-r7,lr}\n"
"\tmov r7, r10\n"
"\tmov r6, r9\n"
"\tmov r5, r8\n"
"\tpush {r5-r7}\n"
"\tsub sp, 0x28\n"
"\tstr r0, [sp]\n"
"\tstr r1, [sp, 0x4]\n"
"\tldr r0, [sp, 0x48]\n"
"\tldr r4, [sp, 0x4C]\n"
"\tldr r1, [sp, 0x50]\n"
"\tldr r5, [sp, 0x54]\n"
"\tlsls r2, 16\n"
"\tlsrs r2, 16\n"
"\tstr r2, [sp, 0x8]\n"
"\tlsls r3, 16\n"
"\tlsrs r3, 16\n"
"\tlsls r0, 16\n"
"\tlsrs r0, 16\n"
"\tstr r0, [sp, 0xC]\n"
"\tlsls r4, 16\n"
"\tlsrs r4, 16\n"
"\tlsls r1, 16\n"
"\tlsrs r1, 16\n"
"\tlsls r5, 16\n"
"\tlsrs r5, 16\n"
"\tldr r2, [sp, 0x4]\n"
"\tldrh r0, [r2, 0x4]\n"
"\tldr r2, [sp, 0xC]\n"
"\tsubs r0, r2\n"
"\tldr r2, [sp, 0x8]\n"
"\tadds r2, r1, r2\n"
"\tstr r2, [sp, 0x10]\n"
"\tcmp r0, r1\n"
"\tbge _0812E7B4\n"
"\tldr r1, [sp, 0x8]\n"
"\tadds r0, r1\n"
"\tstr r0, [sp, 0x10]\n"
"_0812E7B4:\n"
"\tldr r2, [sp, 0x4]\n"
"\tldrh r1, [r2, 0x6]\n"
"\tsubs r0, r1, r4\n"
"\tcmp r0, r5\n"
"\tbge _0812E7C6\n"
"\tadds r0, r3, r1\n"
"\tsubs r0, r4\n"
"\tstr r0, [sp, 0x14]\n"
"\tb _0812E7CA\n"
"_0812E7C6:\n"
"\tadds r5, r3, r5\n"
"\tstr r5, [sp, 0x14]\n"
"_0812E7CA:\n"
"\tldr r0, [sp]\n"
"\tldrh r1, [r0, 0x4]\n"
"\tmovs r2, 0x7\n"
"\tadds r0, r1, 0\n"
"\tands r0, r2\n"
"\tadds r1, r0\n"
"\tasrs r1, 3\n"
"\tstr r1, [sp, 0x18]\n"
"\tldr r0, [sp, 0x4]\n"
"\tldrh r1, [r0, 0x4]\n"
"\tadds r0, r1, 0\n"
"\tands r0, r2\n"
"\tadds r1, r0\n"
"\tasrs r1, 3\n"
"\tstr r1, [sp, 0x1C]\n"
"\tmov r12, r3\n"
"\tmov r8, r4\n"
"\tldr r1, [sp, 0x14]\n"
"\tcmp r12, r1\n"
"\tblt _0812E7F4\n"
"\tb _0812E932\n"
"_0812E7F4:\n"
"\tldr r5, [sp, 0x8]\n"
"\tldr r6, [sp, 0xC]\n"
"\tmov r2, r12\n"
"\tadds r2, 0x1\n"
"\tstr r2, [sp, 0x20]\n"
"\tmov r0, r8\n"
"\tadds r0, 0x1\n"
"\tstr r0, [sp, 0x24]\n"
"\tldr r1, [sp, 0x10]\n"
"\tcmp r5, r1\n"
"\tblt _0812E80C\n"
"\tb _0812E922\n"
"_0812E80C:\n"
"\tmovs r7, 0x1\n"
"\tmovs r2, 0xF0\n"
"\tmov r10, r2\n"
"\tmovs r0, 0xF\n"
"\tmov r9, r0\n"
"_0812E816:\n"
"\tasrs r0, r5, 1\n"
"\tmovs r1, 0x3\n"
"\tands r0, r1\n"
"\tldr r2, [sp]\n"
"\tldr r1, [r2]\n"
"\tadds r1, r0\n"
"\tasrs r0, r5, 3\n"
"\tlsls r0, 5\n"
"\tadds r1, r0\n"
"\tmov r2, r12\n"
"\tasrs r0, r2, 3\n"
"\tldr r2, [sp, 0x18]\n"
"\tmuls r0, r2\n"
"\tlsls r0, 5\n"
"\tadds r1, r0\n"
"\tmov r2, r12\n"
"\tlsls r0, r2, 29\n"
"\tlsrs r0, 27\n"
"\tadds r3, r1, r0\n"
"\tasrs r0, r6, 1\n"
"\tmovs r1, 0x3\n"
"\tands r0, r1\n"
"\tldr r2, [sp, 0x4]\n"
"\tldr r1, [r2]\n"
"\tadds r1, r0\n"
"\tasrs r0, r6, 3\n"
"\tlsls r0, 5\n"
"\tadds r1, r0\n"
"\tmov r2, r8\n"
"\tasrs r0, r2, 3\n"
"\tldr r2, [sp, 0x1C]\n"
"\tmuls r0, r2\n"
"\tlsls r0, 5\n"
"\tadds r1, r0\n"
"\tmov r2, r8\n"
"\tlsls r0, r2, 29\n"
"\tlsrs r0, 27\n"
"\tadds r4, r1, r0\n"
"\tadds r0, r4, 0\n"
"\tands r0, r7\n"
"\tcmp r0, 0\n"
"\tbeq _0812E8C2\n"
"\tsubs r4, 0x1\n"
"\tadds r0, r6, 0\n"
"\tands r0, r7\n"
"\tcmp r0, 0\n"
"\tbeq _0812E89A\n"
"\tldrh r0, [r4]\n"
"\tldr r2, _0812E88C @ =0x00000fff\n"
"\tands r2, r0\n"
"\tadds r0, r5, 0\n"
"\tands r0, r7\n"
"\tcmp r0, 0\n"
"\tbeq _0812E890\n"
"\tldrb r1, [r3]\n"
"\tmov r0, r10\n"
"\tands r0, r1\n"
"\tlsls r0, 8\n"
"\tb _0812E912\n"
"\t.align 2, 0\n"
"_0812E88C: .4byte 0x00000fff\n"
"_0812E890:\n"
"\tldrb r1, [r3]\n"
"\tmov r0, r9\n"
"\tands r0, r1\n"
"\tlsls r0, 12\n"
"\tb _0812E912\n"
"_0812E89A:\n"
"\tldrh r0, [r4]\n"
"\tldr r2, _0812E8B4 @ =0x0000f0ff\n"
"\tands r2, r0\n"
"\tadds r0, r5, 0\n"
"\tands r0, r7\n"
"\tcmp r0, 0\n"
"\tbeq _0812E8B8\n"
"\tldrb r1, [r3]\n"
"\tmov r0, r10\n"
"\tands r0, r1\n"
"\tlsls r0, 4\n"
"\tb _0812E912\n"
"\t.align 2, 0\n"
"_0812E8B4: .4byte 0x0000f0ff\n"
"_0812E8B8:\n"
"\tldrb r1, [r3]\n"
"\tmov r0, r9\n"
"\tands r0, r1\n"
"\tlsls r0, 8\n"
"\tb _0812E912\n"
"_0812E8C2:\n"
"\tadds r0, r6, 0\n"
"\tands r0, r7\n"
"\tcmp r0, 0\n"
"\tbeq _0812E8EE\n"
"\tldrh r0, [r4]\n"
"\tldr r2, _0812E8E0 @ =0x0000ff0f\n"
"\tands r2, r0\n"
"\tadds r0, r5, 0\n"
"\tands r0, r7\n"
"\tcmp r0, 0\n"
"\tbeq _0812E8E4\n"
"\tldrb r1, [r3]\n"
"\tmov r0, r10\n"
"\tb _0812E910\n"
"\t.align 2, 0\n"
"_0812E8E0: .4byte 0x0000ff0f\n"
"_0812E8E4:\n"
"\tldrb r1, [r3]\n"
"\tmov r0, r9\n"
"\tands r0, r1\n"
"\tlsls r0, 4\n"
"\tb _0812E912\n"
"_0812E8EE:\n"
"\tldrh r0, [r4]\n"
"\tldr r2, _0812E908 @ =0x0000fff0\n"
"\tands r2, r0\n"
"\tadds r0, r5, 0\n"
"\tands r0, r7\n"
"\tcmp r0, 0\n"
"\tbeq _0812E90C\n"
"\tldrb r1, [r3]\n"
"\tmov r0, r10\n"
"\tands r0, r1\n"
"\tlsrs r0, 4\n"
"\tb _0812E912\n"
"\t.align 2, 0\n"
"_0812E908: .4byte 0x0000fff0\n"
"_0812E90C:\n"
"\tldrb r1, [r3]\n"
"\tmov r0, r9\n"
"_0812E910:\n"
"\tands r0, r1\n"
"_0812E912:\n"
"\torrs r2, r0\n"
"\tstrh r2, [r4]\n"
"\tadds r5, 0x1\n"
"\tadds r6, 0x1\n"
"\tldr r0, [sp, 0x10]\n"
"\tcmp r5, r0\n"
"\tbge _0812E922\n"
"\tb _0812E816\n"
"_0812E922:\n"
"\tldr r1, [sp, 0x20]\n"
"\tmov r12, r1\n"
"\tldr r2, [sp, 0x24]\n"
"\tmov r8, r2\n"
"\tldr r0, [sp, 0x14]\n"
"\tcmp r12, r0\n"
"\tbge _0812E932\n"
"\tb _0812E7F4\n"
"_0812E932:\n"
"\tadd sp, 0x28\n"
"\tpop {r3-r5}\n"
"\tmov r8, r3\n"
"\tmov r9, r4\n"
"\tmov r10, r5\n"
"\tpop {r4-r7}\n"
"\tpop {r0}\n"
"\tbx r0");
s32 loopSrcY, loopDstY, loopSrcX, loopDstX, xEnd, yEnd, multiplierSrcY, multiplierDstY;
u16 toOrr;
const u8 *pixelsSrc;
u16 *pixelsDst;
if (dst->width - dstX < width)
xEnd = dst->width - dstX + srcX;
else
xEnd = width + srcX;
if (dst->height - dstY < height)
yEnd = srcY + dst->height - dstY;
else
yEnd = srcY + height;
multiplierSrcY = (src->width + (src->width & 7)) >> 3;
multiplierDstY = (dst->width + (dst->width & 7)) >> 3;
for (loopSrcY = srcY, loopDstY = dstY; loopSrcY < yEnd; loopSrcY++, loopDstY++)
{
for (loopSrcX = srcX, loopDstX = dstX; loopSrcX < xEnd; loopSrcX++, loopDstX++)
{
#ifndef NONMATCHING
asm("":::"r4");
#endif
pixelsSrc = src->pixels + ((loopSrcX >> 1) & 3) + ((loopSrcX >> 3) << 5) + (((loopSrcY >> 3) * multiplierSrcY) << 5) + ((u32)(loopSrcY << 0x1d) >> 0x1B);
pixelsDst = (u16 *)(dst->pixels + ((loopDstX >> 1) & 3) + ((loopDstX >> 3) << 5) + ((( loopDstY >> 3) * multiplierDstY) << 5) + ((u32)( loopDstY << 0x1d) >> 0x1B));
if ((uintptr_t)pixelsDst & 0x1)
{
pixelsDst = (void *)pixelsDst - 1;
if (loopDstX & 0x1)
{
toOrr = *pixelsDst & 0x0fff;
if (loopSrcX & 0x1)
*pixelsDst = toOrr | ((*pixelsSrc & 0xf0) << 8);
else
*pixelsDst = toOrr | ((*pixelsSrc & 0x0f) << 12);
}
else
{
toOrr = *pixelsDst & 0xf0ff;
if (loopSrcX & 0x1)
*pixelsDst = toOrr | ((*pixelsSrc & 0xf0) << 4);
else
*pixelsDst = toOrr | ((*pixelsSrc & 0x0f) << 8);
}
}
else
{
if (loopDstX & 1)
{
toOrr = *pixelsDst & 0xff0f;
if (loopSrcX & 1)
*pixelsDst = toOrr | ((*pixelsSrc & 0xf0) << 0);
else
*pixelsDst = toOrr | ((*pixelsSrc & 0x0f) << 4);
}
else
{
toOrr = *pixelsDst & 0xfff0;
if (loopSrcX & 1)
*pixelsDst = toOrr | ((*pixelsSrc & 0xf0) >> 4);
else
*pixelsDst = toOrr | ((*pixelsSrc & 0x0f) >> 0);
}
}
}
}
}
#define tEvA data[0]
src/quest_log.c
+2 -2
View File
@@ -871,7 +871,7 @@ void sub_8110F90(u8 unused)
gSaveBlock1Ptr->location.mapNum = 19;
gSaveBlock1Ptr->location.warpId = -1;
gUnknown_203ADF8 = 0;
gUnknown_2031DD8 = 1;
gDisableMapMusicChangeOnMapLoad = 1;
sub_8082740(1);
sub_8111368();
}
@@ -1567,7 +1567,7 @@ void sub_81120AC(u8 taskId)
switch (data[0])
{
case 0:
gUnknown_2031DD8 = 0;
gDisableMapMusicChangeOnMapLoad = 0;
Overworld_PlaySpecialMapMusic();
sub_811229C();
FillWindowPixelRect(gUnknown_203ADFE[0], 0xF, 0, 0, gUnknown_845661C[0].width * 8, gUnknown_845661C[0].height * 8);
src/sound.c
+2 -2
View File
@@ -15,7 +15,7 @@ struct Fanfare
};
// TODO: what are these
extern u8 gUnknown_2031DD8;
extern u8 gDisableMapMusicChangeOnMapLoad;
extern u8 gUnknown_203ADFA;
extern u8 gUnknown_203F174;
@@ -571,7 +571,7 @@ void PlayBGM(u16 songNum)
void PlaySE(u16 songNum)
{
if(gUnknown_2031DD8 == 0 && gUnknown_203ADFA != 2)
if(gDisableMapMusicChangeOnMapLoad == 0 && gUnknown_203ADFA != 2)
m4aSongNumStart(songNum);
}
src/text.c
+351 -833
View File
File diff suppressed because it is too large Load Diff
src/text_printer.c
+30 -30
View File
@@ -45,27 +45,27 @@ void DeactivateAllTextPrinters (void)
{
int printer;
for (printer = 0; printer < NUM_TEXT_PRINTERS; ++printer)
sTextPrinters[printer].sub_union.sub.active = 0;
sTextPrinters[printer].active = 0;
}
u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16))
{
struct TextPrinterTemplate subPrinter;
struct TextPrinterTemplate printerTemplate;
subPrinter.currentChar = str;
subPrinter.windowId = windowId;
subPrinter.fontId = fontId;
subPrinter.x = x;
subPrinter.y = y;
subPrinter.currentX = x;
subPrinter.currentY = y;
subPrinter.letterSpacing = gFonts[fontId].letterSpacing;
subPrinter.lineSpacing = gFonts[fontId].lineSpacing;
subPrinter.unk = gFonts[fontId].unk;
subPrinter.fgColor = gFonts[fontId].fgColor;
subPrinter.bgColor = gFonts[fontId].bgColor;
subPrinter.shadowColor = gFonts[fontId].shadowColor;
return AddTextPrinter(&subPrinter, speed, callback);
printerTemplate.currentChar = str;
printerTemplate.windowId = windowId;
printerTemplate.fontId = fontId;
printerTemplate.x = x;
printerTemplate.y = y;
printerTemplate.currentX = x;
printerTemplate.currentY = y;
printerTemplate.letterSpacing = gFonts[fontId].letterSpacing;
printerTemplate.lineSpacing = gFonts[fontId].lineSpacing;
printerTemplate.unk = gFonts[fontId].unk;
printerTemplate.fgColor = gFonts[fontId].fgColor;
printerTemplate.bgColor = gFonts[fontId].bgColor;
printerTemplate.shadowColor = gFonts[fontId].shadowColor;
return AddTextPrinter(&printerTemplate, speed, callback);
}
bool16 AddTextPrinter(struct TextPrinterTemplate *textSubPrinter, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16))
@@ -76,18 +76,18 @@ bool16 AddTextPrinter(struct TextPrinterTemplate *textSubPrinter, u8 speed, void
if (!gFonts)
return FALSE;
sTempTextPrinter.sub_union.sub.active = 1;
sTempTextPrinter.active = 1;
sTempTextPrinter.state = 0;
sTempTextPrinter.text_speed = speed;
sTempTextPrinter.textSpeed = speed;
sTempTextPrinter.delayCounter = 0;
sTempTextPrinter.scrollDistance = 0;
for (i = 0; i < 7; ++i)
{
sTempTextPrinter.sub_union.sub_fields[i] = 0;
sTempTextPrinter.subUnion.fields[i] = 0;
}
sTempTextPrinter.subPrinter = *textSubPrinter;
sTempTextPrinter.printerTemplate = *textSubPrinter;
sTempTextPrinter.callback = callback;
sTempTextPrinter.minLetterSpacing = 0;
sTempTextPrinter.japanese = 0;
@@ -95,12 +95,12 @@ bool16 AddTextPrinter(struct TextPrinterTemplate *textSubPrinter, u8 speed, void
GenerateFontHalfRowLookupTable(textSubPrinter->fgColor, textSubPrinter->bgColor, textSubPrinter->shadowColor);
if (speed != TEXT_SPEED_FF && speed != 0x0)
{
--sTempTextPrinter.text_speed;
--sTempTextPrinter.textSpeed;
sTextPrinters[textSubPrinter->windowId] = sTempTextPrinter;
}
else
{
sTempTextPrinter.text_speed = 0;
sTempTextPrinter.textSpeed = 0;
for (j = 0; j < 0x400; ++j)
{
if ((u32)RenderFont(&sTempTextPrinter) == 1)
@@ -108,8 +108,8 @@ bool16 AddTextPrinter(struct TextPrinterTemplate *textSubPrinter, u8 speed, void
}
if (speed != TEXT_SPEED_FF)
CopyWindowToVram(sTempTextPrinter.subPrinter.windowId, 2);
sTextPrinters[textSubPrinter->windowId].sub_union.sub.active = 0;
CopyWindowToVram(sTempTextPrinter.printerTemplate.windowId, 2);
sTextPrinters[textSubPrinter->windowId].active = 0;
}
return TRUE;
}
@@ -121,18 +121,18 @@ void RunTextPrinters(void)
for (i = 0; i < 0x20; ++i)
{
if (sTextPrinters[i].sub_union.sub.active != 0)
if (sTextPrinters[i].active != 0)
{
temp = RenderFont(&sTextPrinters[i]);
switch (temp) {
case 0:
CopyWindowToVram(sTextPrinters[i].subPrinter.windowId, 2);
CopyWindowToVram(sTextPrinters[i].printerTemplate.windowId, 2);
case 3:
if (sTextPrinters[i].callback != 0)
sTextPrinters[i].callback(&sTextPrinters[i].subPrinter, temp);
sTextPrinters[i].callback(&sTextPrinters[i].printerTemplate, temp);
break;
case 1:
sTextPrinters[i].sub_union.sub.active = 0;
sTextPrinters[i].active = 0;
break;
}
}
@@ -141,7 +141,7 @@ void RunTextPrinters(void)
bool16 IsTextPrinterActive(u8 id)
{
return sTextPrinters[id].sub_union.sub.active;
return sTextPrinters[id].active;
}
u32 RenderFont(struct TextPrinter *textPrinter)
@@ -149,7 +149,7 @@ u32 RenderFont(struct TextPrinter *textPrinter)
u32 ret;
while (TRUE)
{
ret = gFonts[textPrinter->subPrinter.fontId].fontFunction(textPrinter);
ret = gFonts[textPrinter->printerTemplate.fontId].fontFunction(textPrinter);
if (ret != 2)
return ret;
}
src/trainer_pokemon_sprites.c
+1 -1
View File
@@ -278,7 +278,7 @@ u16 FreeAndDestroyMonPicSprite(u16 spriteId)
return FreeAndDestroyPicSpriteInternal(spriteId);
}
u16 sub_810C228(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId)
u16 LoadMonPicForCredits(u16 species, u32 otId, u32 personality, bool8 isFrontPic, u8 paletteSlot, u8 windowId)
{
return sub_810C0C0(species, otId, personality, isFrontPic, 0, 0, paletteSlot, windowId, FALSE);
}
sym_ewram.txt
+2 -3
View File
@@ -516,7 +516,7 @@ gUnknown_2031DCC: @ 2031DCC
gUnknown_2031DD4: @ 2031DD4
.space 0x4
gUnknown_2031DD8: @ 2031DD8
gDisableMapMusicChangeOnMapLoad: @ 2031DD8
.space 0x2
gUnknown_2031DDA: @ 2031DDA
@@ -1086,8 +1086,7 @@ gUnknown_203AB38: @ 203AB38
gUnknown_203AB3C: @ 203AB3C
.space 0x4
gUnknown_203AB40: @ 203AB40
.space 0x4
.include "src/credits.o"
gUnknown_203AB44: @ 203AB44
.space 0x4