ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48 from Diegoisawesome/cleanup

Browse Source 
Extract scattered baseroms and cleanup
This commit is contained in:
Cameron Hall 2017-09-26 13:45:41 -05:00 committed by GitHub
commit 701d53be8d
41 changed files with 2640 additions and 635 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
asm/cable_car.s
View File

@ -242,7 +242,7 @@ _0814FE96:
bls _0814FE96
ldr r0, =gUnknown_085CDB74
bl LoadSpritePalettes
ldr r0, =gUnknown_085CD67C
ldr r0, =gCableCarMtChimneyTilemap
adds r1, r5, 0
bl malloc_and_decompress
ldr r4, =gUnknown_0203ABAC
@ -250,7 +250,7 @@ _0814FE96:
ldr r2, =0x000040fc
adds r1, r2
str r0, [r1]
ldr r0, =gUnknown_085CD7D4
ldr r0, =gCableCarTreeTilemap
adds r1, r5, 0
bl malloc_and_decompress
ldr r1, [r4]
@ -258,14 +258,14 @@ _0814FE96:
lsls r3, 7
adds r1, r3
str r0, [r1]
ldr r0, =gUnknown_085CD958
ldr r0, =gCableCarMountainTilemap
adds r1, r5, 0
bl malloc_and_decompress
ldr r1, [r4]
ldr r2, =0x00004104
adds r1, r2
str r0, [r1]
ldr r0, =gUnknown_085CDB30
ldr r0, =gCableCarPylonStemTilemap
adds r1, r5, 0
bl malloc_and_decompress
ldr r1, [r4]
@ -274,7 +274,7 @@ _0814FE96:
str r0, [r2]
ldr r0, =0x00004108
adds r1, r0
ldr r0, =gUnknown_085CDB1C
ldr r0, =gCableCarPylonHookTilemapEntries
str r0, [r1]
ldr r1, =gUnknown_08DBA5B8
movs r0, 0
@ -1908,7 +1908,7 @@ sub_8150D28: @ 8150D28
mov r5, r8
push {r5-r7}
sub sp, 0x28
ldr r1, =gUnknown_085CDBE4
ldr r1, =gCableCarPlayerGraphicsIDs
add r0, sp, 0xC
movs r2, 0x2
bl memcpy
@ -1917,17 +1917,17 @@ sub_8150D28: @ 8150D28
lsrs r0, 16
mov r9, r0
add r6, sp, 0x10
ldr r1, =gUnknown_085CDBE6
ldr r1, =gMtChimneyHikerGraphicsIDs
adds r0, r6, 0
movs r2, 0x4
bl memcpy
add r5, sp, 0x14
ldr r1, =gUnknown_085CDBEA
ldr r1, =gMtChimneyHikerCoords
adds r0, r5, 0
movs r2, 0x8
bl memcpy
add r4, sp, 0x1C
ldr r1, =gUnknown_085CDBF2
ldr r1, =gMtChimneyHikerMovementDelayTable
adds r0, r4, 0
movs r2, 0x4
bl memcpy
@ -1982,7 +1982,7 @@ _08150D86:
movs r0, 0x49
strh r0, [r1, 0x30]
_08150DD0:
ldr r4, =gUnknown_085CDB9C
ldr r4, =gSpriteTemplate_85CDB9C
adds r0, r4, 0
movs r1, 0xB0
movs r2, 0x2B
@ -2088,7 +2088,7 @@ _08150E68:
movs r0, 0x27
strh r0, [r1, 0x30]
_08150ED4:
ldr r4, =gUnknown_085CDB9C
ldr r4, =gSpriteTemplate_85CDB9C
adds r0, r4, 0
movs r1, 0x68
movs r2, 0x9
@ -2149,7 +2149,7 @@ _08150F3E:
ldr r3, =0xfff80000
adds r2, r3
asrs r2, 16
ldr r0, =gUnknown_085CDBCC
ldr r0, =gSpriteTemplate_85CDBCC
movs r3, 0x68
bl CreateSprite
lsls r0, 24

31
asm/macros.inc
View File

@ -20,12 +20,43 @@
.2byte \tag
.endm
.macro null_obj_tiles
obj_tiles 0, 0, 0
.endm
.macro obj_pal address, tag
.4byte \address
.2byte \tag
.2byte 0@ padding
.endm
.macro null_obj_pal
obj_pal 0, 0
.endm
.macro paired_pals tag, address
.2byte \tag
.2byte 0 @ padding
.4byte \address
.endm
@ For object animation frames.
.macro obj_frame_tiles address, uncompressed_size
.4byte \address
.2byte \uncompressed_size
.2byte 0 @ padding
.endm
.macro spr_template tile_tag, pal_tag, oam, anims, images, affine_anims, callback
.2byte \tile_tag
.2byte \pal_tag
.4byte \oam
.4byte \anims
.4byte \images
.4byte \affine_anims
.4byte \callback
.endm
@ Berry trees have a table defining the palette slot used for each of their 5
@ stages. However, the first 2 stages always use the same slots regardless of
@ the type of tree and the slots of the last 3 stages always equal each other.

4
asm/macros/window.inc
View File

@ -8,6 +8,10 @@
.2byte \vram_tile_offset
.endm
.macro window_template_terminator
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
.endm
.macro glyph_width_func font_id, func
.4byte \font_id
.4byte \func

2
asm/pokenav.s
View File

@ -28559,7 +28559,7 @@ _081D5268:
ldr r0, =gUnknown_085EE097
bl sub_8018884
ldr r0, =gUnknown_03006370
ldr r1, =gUnknown_089A6550
ldr r1, =gMultiBootProgram_BerryGlitchFix_Start
ldr r2, =gUnknown_089A3470
subs r1, r2
bl sub_81D4D50

1
constants/constants.inc
View File

@ -13,6 +13,7 @@
.include "constants/trainer_constants.inc"
.include "constants/battle_frontier_constants.inc"
.include "constants/map_constants.inc"
.include "constants/map_object_constants.inc"
.include "constants/berry_constants.inc"
.include "constants/field_object_constants.inc"
.include "constants/contest_move_effects.inc"

230
constants/map_object_constants.inc Normal file
View File

@ -0,0 +1,230 @@
.set MAP_OBJ_GFX_BRENDAN_NORMAL, 0
.set MAP_OBJ_GFX_BRENDAN_MACH_BIKE, 1
.set MAP_OBJ_GFX_BRENDAN_SURFING, 2
.set MAP_OBJ_GFX_BRENDAN_FIELD_MOVE, 3
.set MAP_OBJ_GFX_QUINTY_PLUMP, 4
.set MAP_OBJ_GFX_LITTLE_BOY_1, 5
.set MAP_OBJ_GFX_LITTLE_GIRL_1, 6
.set MAP_OBJ_GFX_BOY_1, 7
.set MAP_OBJ_GFX_GIRL_1, 8
.set MAP_OBJ_GFX_BOY_2, 9
.set MAP_OBJ_GFX_GIRL_2, 10
.set MAP_OBJ_GFX_LITTLE_BOY_2, 11
.set MAP_OBJ_GFX_LITTLE_GIRL_2, 12
.set MAP_OBJ_GFX_BOY_3, 13
.set MAP_OBJ_GFX_GIRL_3, 14
.set MAP_OBJ_GFX_BOY_4, 15
.set MAP_OBJ_GFX_WOMAN_1, 16
.set MAP_OBJ_GFX_FAT_MAN, 17
.set MAP_OBJ_GFX_WOMAN_2, 18
.set MAP_OBJ_GFX_MAN_1, 19
.set MAP_OBJ_GFX_WOMAN_3, 20
.set MAP_OBJ_GFX_OLD_MAN_1, 21
.set MAP_OBJ_GFX_OLD_WOMAN_1, 22
.set MAP_OBJ_GFX_MAN_2, 23
.set MAP_OBJ_GFX_WOMAN_4, 24
.set MAP_OBJ_GFX_MAN_3, 25
.set MAP_OBJ_GFX_WOMAN_5, 26
.set MAP_OBJ_GFX_COOK, 27
.set MAP_OBJ_GFX_WOMAN_6, 28
.set MAP_OBJ_GFX_OLD_MAN_2, 29
.set MAP_OBJ_GFX_OLD_WOMAN_2, 30
.set MAP_OBJ_GFX_CAMPER, 31
.set MAP_OBJ_GFX_PICNICKER, 32
.set MAP_OBJ_GFX_MAN_4, 33
.set MAP_OBJ_GFX_WOMAN_7, 34
.set MAP_OBJ_GFX_YOUNGSTER, 35
.set MAP_OBJ_GFX_BUG_CATCHER, 36
.set MAP_OBJ_GFX_PSYCHIC_M, 37
.set MAP_OBJ_GFX_SCHOOL_KID_M, 38
.set MAP_OBJ_GFX_MANIAC, 39
.set MAP_OBJ_GFX_HEX_MANIAC, 40
.set MAP_OBJ_GFX_RAYQUAZA, 41
.set MAP_OBJ_GFX_SWIMMER_M, 42
.set MAP_OBJ_GFX_SWIMMER_F, 43
.set MAP_OBJ_GFX_BLACK_BELT, 44
.set MAP_OBJ_GFX_BEAUTY, 45
.set MAP_OBJ_GFX_SCIENTIST_1, 46
.set MAP_OBJ_GFX_LASS, 47
.set MAP_OBJ_GFX_GENTLEMAN, 48
.set MAP_OBJ_GFX_SAILOR, 49
.set MAP_OBJ_GFX_FISHERMAN, 50
.set MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 51
.set MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 52
.set MAP_OBJ_GFX_TUBER_F, 53
.set MAP_OBJ_GFX_TUBER_M, 54
.set MAP_OBJ_GFX_HIKER, 55
.set MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 56
.set MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 57
.set MAP_OBJ_GFX_NURSE, 58
.set MAP_OBJ_GFX_ITEM_BALL, 59
.set MAP_OBJ_GFX_BERRY_TREE, 60
.set MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, 61
.set MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES, 62
.set MAP_OBJ_GFX_BRENDAN_ACRO_BIKE, 63
.set MAP_OBJ_GFX_PROF_BIRCH, 64
.set MAP_OBJ_GFX_MAN_5, 65
.set MAP_OBJ_GFX_MAN_6, 66
.set MAP_OBJ_GFX_REPORTER_M, 67
.set MAP_OBJ_GFX_REPORTER_F, 68
.set MAP_OBJ_GFX_BARD, 69
.set MAP_OBJ_GFX_HIPSTER, 70
.set MAP_OBJ_GFX_TRADER, 71
.set MAP_OBJ_GFX_STORYTELLER, 72
.set MAP_OBJ_GFX_GIDDY, 73
.set MAP_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_1, 74
.set MAP_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_2, 75
.set MAP_OBJ_GFX_UNUSED_NATU_DOLL, 76
.set MAP_OBJ_GFX_UNUSED_MAGNEMITE_DOLL, 77
.set MAP_OBJ_GFX_UNUSED_SQUIRTLE_DOLL, 78
.set MAP_OBJ_GFX_UNUSED_WOOPER_DOLL, 79
.set MAP_OBJ_GFX_UNUSED_PIKACHU_DOLL, 80
.set MAP_OBJ_GFX_UNUSED_PORYGON2_DOLL, 81
.set MAP_OBJ_GFX_CUTTABLE_TREE, 82
.set MAP_OBJ_GFX_MART_EMPLOYEE, 83
.set MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 84
.set MAP_OBJ_GFX_TEALA, 85
.set MAP_OBJ_GFX_BREAKABLE_ROCK, 86
.set MAP_OBJ_GFX_PUSHABLE_BOULDER, 87
.set MAP_OBJ_GFX_MR_BRINEYS_BOAT, 88
.set MAP_OBJ_GFX_MAY_NORMAL, 89
.set MAP_OBJ_GFX_MAY_MACH_BIKE, 90
.set MAP_OBJ_GFX_MAY_ACRO_BIKE, 91
.set MAP_OBJ_GFX_MAY_SURFING, 92
.set MAP_OBJ_GFX_MAY_FIELD_MOVE, 93
.set MAP_OBJ_GFX_TRUCK, 94
.set MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 95
.set MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 96
.set MAP_OBJ_GFX_BIRCHS_BAG, 97
.set MAP_OBJ_GFX_ZIGZAGOON, 98
.set MAP_OBJ_GFX_ARTIST, 99
.set MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 100
.set MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE, 101
.set MAP_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE, 102
.set MAP_OBJ_GFX_RIVAL_BRENDAN_SURFING, 103
.set MAP_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE, 104
.set MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 105
.set MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE, 106
.set MAP_OBJ_GFX_RIVAL_MAY_ACRO_BIKE, 107
.set MAP_OBJ_GFX_RIVAL_MAY_SURFING, 108
.set MAP_OBJ_GFX_RIVAL_MAY_FIELD_MOVE, 109
.set MAP_OBJ_GFX_CAMERAMAN, 110
.set MAP_OBJ_GFX_BRENDAN_UNDERWATER, 111
.set MAP_OBJ_GFX_MAY_UNDERWATER, 112
.set MAP_OBJ_GFX_MOVING_BOX, 113
.set MAP_OBJ_GFX_CABLE_CAR, 114
.set MAP_OBJ_GFX_SCIENTIST_2, 115
.set MAP_OBJ_GFX_MAN_7, 116
.set MAP_OBJ_GFX_AQUA_MEMBER_M, 117
.set MAP_OBJ_GFX_AQUA_MEMBER_F, 118
.set MAP_OBJ_GFX_MAGMA_MEMBER_M, 119
.set MAP_OBJ_GFX_MAGMA_MEMBER_F, 120
.set MAP_OBJ_GFX_SIDNEY, 121
.set MAP_OBJ_GFX_PHOEBE, 122
.set MAP_OBJ_GFX_GLACIA, 123
.set MAP_OBJ_GFX_DRAKE, 124
.set MAP_OBJ_GFX_ROXANNE, 125
.set MAP_OBJ_GFX_BRAWLY, 126
.set MAP_OBJ_GFX_WATTSON, 127
.set MAP_OBJ_GFX_FLANNERY, 128
.set MAP_OBJ_GFX_NORMAN, 129
.set MAP_OBJ_GFX_WINONA, 130
.set MAP_OBJ_GFX_LIZA, 131
.set MAP_OBJ_GFX_TATE, 132
.set MAP_OBJ_GFX_WALLACE, 133
.set MAP_OBJ_GFX_STEVEN, 134
.set MAP_OBJ_GFX_WALLY, 135
.set MAP_OBJ_GFX_LITTLE_BOY_3, 136
.set MAP_OBJ_GFX_BRENDAN_FISHING, 137
.set MAP_OBJ_GFX_MAY_FISHING, 138
.set MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 139
.set MAP_OBJ_GFX_SS_TIDAL, 140
.set MAP_OBJ_GFX_SUBMARINE_SHADOW, 141
.set MAP_OBJ_GFX_PICHU_DOLL, 142
.set MAP_OBJ_GFX_PIKACHU_DOLL, 143
.set MAP_OBJ_GFX_MARILL_DOLL, 144
.set MAP_OBJ_GFX_TOGEPI_DOLL, 145
.set MAP_OBJ_GFX_CYNDAQUIL_DOLL, 146
.set MAP_OBJ_GFX_CHIKORITA_DOLL, 147
.set MAP_OBJ_GFX_TOTODILE_DOLL, 148
.set MAP_OBJ_GFX_JIGGLYPUFF_DOLL, 149
.set MAP_OBJ_GFX_MEOWTH_DOLL, 150
.set MAP_OBJ_GFX_CLEFAIRY_DOLL, 151
.set MAP_OBJ_GFX_DITTO_DOLL, 152
.set MAP_OBJ_GFX_SMOOCHUM_DOLL, 153
.set MAP_OBJ_GFX_TREECKO_DOLL, 154
.set MAP_OBJ_GFX_TORCHIC_DOLL, 155
.set MAP_OBJ_GFX_MUDKIP_DOLL, 156
.set MAP_OBJ_GFX_DUSKULL_DOLL, 157
.set MAP_OBJ_GFX_WYNAUT_DOLL, 158
.set MAP_OBJ_GFX_BALTOY_DOLL, 159
.set MAP_OBJ_GFX_KECLEON_DOLL, 160
.set MAP_OBJ_GFX_AZURILL_DOLL, 161
.set MAP_OBJ_GFX_SKITTY_DOLL, 162
.set MAP_OBJ_GFX_SWABLU_DOLL, 163
.set MAP_OBJ_GFX_GULPIN_DOLL, 164
.set MAP_OBJ_GFX_LOTAD_DOLL, 165
.set MAP_OBJ_GFX_SEEDOT_DOLL, 166
.set MAP_OBJ_GFX_PIKA_CUSHION, 167
.set MAP_OBJ_GFX_ROUND_CUSHION, 168
.set MAP_OBJ_GFX_KISS_CUSHION, 169
.set MAP_OBJ_GFX_ZIGZAG_CUSHION, 170
.set MAP_OBJ_GFX_SPIN_CUSHION, 171
.set MAP_OBJ_GFX_DIAMOND_CUSHION, 172
.set MAP_OBJ_GFX_BALL_CUSHION, 173
.set MAP_OBJ_GFX_GRASS_CUSHION, 174
.set MAP_OBJ_GFX_FIRE_CUSHION, 175
.set MAP_OBJ_GFX_WATER_CUSHION, 176
.set MAP_OBJ_GFX_BIG_SNORLAX_DOLL, 177
.set MAP_OBJ_GFX_BIG_RHYDON_DOLL, 178
.set MAP_OBJ_GFX_BIG_LAPRAS_DOLL, 179
.set MAP_OBJ_GFX_BIG_VENUSAUR_DOLL, 180
.set MAP_OBJ_GFX_BIG_CHARIZARD_DOLL, 181
.set MAP_OBJ_GFX_BIG_BLASTOISE_DOLL, 182
.set MAP_OBJ_GFX_BIG_WAILMER_DOLL, 183
.set MAP_OBJ_GFX_BIG_REGIROCK_DOLL, 184
.set MAP_OBJ_GFX_BIG_REGICE_DOLL, 185
.set MAP_OBJ_GFX_BIG_REGISTEEL_DOLL, 186
.set MAP_OBJ_GFX_LATIAS, 187
.set MAP_OBJ_GFX_LATIOS, 188
.set MAP_OBJ_GFX_BOY_5, 189
.set MAP_OBJ_GFX_CONTEST_JUDGE, 190
.set MAP_OBJ_GFX_BRENDAN_WATERING, 191
.set MAP_OBJ_GFX_MAY_WATERING, 192
.set MAP_OBJ_GFX_BRENDAN_DECORATING, 193
.set MAP_OBJ_GFX_MAY_DECORATING, 194
.set MAP_OBJ_GFX_ARCHIE, 195
.set MAP_OBJ_GFX_MAXIE, 196
.set MAP_OBJ_GFX_KYOGRE_1, 197
.set MAP_OBJ_GFX_GROUDON_1, 198
.set MAP_OBJ_GFX_FOSSIL, 199
.set MAP_OBJ_GFX_REGIROCK, 200
.set MAP_OBJ_GFX_REGICE, 201
.set MAP_OBJ_GFX_REGISTEEL, 202
.set MAP_OBJ_GFX_SKITTY, 203
.set MAP_OBJ_GFX_KECLEON_1, 204
.set MAP_OBJ_GFX_KYOGRE_2, 205
.set MAP_OBJ_GFX_GROUDON_2, 206
.set MAP_OBJ_GFX_RAYQUAZA_2, 207
.set MAP_OBJ_GFX_ZIGZAGOON_2, 208
.set MAP_OBJ_GFX_PIKACHU, 209
.set MAP_OBJ_GFX_AZUMARILL, 210
.set MAP_OBJ_GFX_WINGULL, 211
.set MAP_OBJ_GFX_KECLEON_2, 212
.set MAP_OBJ_GFX_TUBER_M_SWIMMING, 213
.set MAP_OBJ_GFX_AZURILL, 214
.set MAP_OBJ_GFX_MOM, 215
.set MAP_OBJ_GFX_LINK_BRENDAN, 216
.set MAP_OBJ_GFX_LINK_MAY, 217
.set SHADOW_SIZE_S, 0
.set SHADOW_SIZE_M, 1
.set SHADOW_SIZE_L, 2
.set SHADOW_SIZE_XL, 3
.set F_INANIMATE, 1 << 6
.set F_DISABLE_REFLECTION_PALETTE_LOAD, 1 << 7
.set TRACKS_NONE, 0
.set TRACKS_FOOT, 1
.set TRACKS_BIKE_TIRE, 2

8
data/battle_4.s
View File

@ -67,13 +67,7 @@ gUnknown_0831C3B8:: @ 831C3B8
.align 2
gUnknown_0831C3C0:: @ 831C3C0
.2byte 0xd75a @ tileTag
.2byte 0xd75a @ paletteTag
.4byte gUnknown_0831C3B8
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_804F450
spr_template 0xd75a, 0xd75a, gUnknown_0831C3B8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_804F450
.align 2
sProtectSuccessRates:: @ 831C3D8

75
data/battle_ai_scripts.s
View File

@ -5,4 +5,77 @@
.align 2
gBattleAI_ScriptsTable:: @ 82DBEF8
.incbin "baserom.gba", 0x2dbef8, 0x2458
.4byte gBattleAIScript_82DBF78
.4byte gBattleAIScript_82DDE3F
.4byte gBattleAIScript_82DC7B0
.4byte gBattleAIScript_82DDE71
.4byte gBattleAIScript_82DDEDD
.4byte gBattleAIScript_82DDEC8
.4byte gBattleAIScript_82DDF09
.4byte gBattleAIScript_82DDFB4
.4byte gBattleAIScript_82DE193
.4byte gBattleAIScript_82DE2ED
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE34E
.4byte gBattleAIScript_82DE309
.4byte gBattleAIScript_82DE337
.4byte gBattleAIScript_82DE33E
gBattleAIScript_82DBF78:: @ 82DBF78
.incbin "baserom.gba", 0x2dbf78, 0x838
gBattleAIScript_82DC7B0:: @ 82DC7B0
.incbin "baserom.gba", 0x2dc7b0, 0x168F
gBattleAIScript_82DDE3F:: @ 82DDE3F
.incbin "baserom.gba", 0x2dde3f, 0x32
gBattleAIScript_82DDE71:: @ 82DDE71
.incbin "baserom.gba", 0x2dde71, 0x57
gBattleAIScript_82DDEC8:: @ 82DDEC8
.incbin "baserom.gba", 0x2ddec8, 0x15
gBattleAIScript_82DDEDD:: @ 82DDEDD
.incbin "baserom.gba", 0x2ddedd, 0x2c
gBattleAIScript_82DDF09:: @ 82DDF09
.incbin "baserom.gba", 0x2ddf09, 0xab
gBattleAIScript_82DDFB4:: @ 82DDFB4
.incbin "baserom.gba", 0x2ddfb4, 0x1df
gBattleAIScript_82DE193:: @ 82DE193
.incbin "baserom.gba", 0x2de193, 0x15a
gBattleAIScript_82DE2ED:: @ 82DE2ED
.incbin "baserom.gba", 0x2de2ed, 0x1c
gBattleAIScript_82DE309:: @ 82DE309
.incbin "baserom.gba", 0x2de309, 0x2e
gBattleAIScript_82DE337:: @ 82DE337
.incbin "baserom.gba", 0x2de337, 0x7
gBattleAIScript_82DE33E:: @ 82DE33E
.incbin "baserom.gba", 0x2de33e, 0x10
gBattleAIScript_82DE34E:: @ 82DE34E
.incbin "baserom.gba", 0x2de34e, 0x2

112
data/battle_anim_8170478.s
View File

@ -97,113 +97,41 @@ gUnknown_085E51C0:: @ 85E51C0
.align 2
gUnknown_085E51F0:: @ 85E51F0
.2byte 0xd6ec @ tileTag
.2byte 0xd6ec @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6ec, 0xd6ec, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6ed @ tileTag
.2byte 0xd6ed @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6ed, 0xd6ed, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6ee @ tileTag
.2byte 0xd6ee @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6ee, 0xd6ee, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6ef @ tileTag
.2byte 0xd6ef @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6ef, 0xd6ef, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085E5250:: @ 85E5250
.2byte 0xd6f0 @ tileTag
.2byte 0xd6f0 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f0, 0xd6f0, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f1 @ tileTag
.2byte 0xd6f1 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f1, 0xd6f1, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f2 @ tileTag
.2byte 0xd6f2 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f2, 0xd6f2, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f3 @ tileTag
.2byte 0xd6f3 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f3, 0xd6f3, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f4 @ tileTag
.2byte 0xd6f4 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f4, 0xd6f4, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f5 @ tileTag
.2byte 0xd6f5 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f5, 0xd6f5, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f6 @ tileTag
.2byte 0xd6f6 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f6, 0xd6f6, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
.2byte 0xd6f7 @ tileTag
.2byte 0xd6f7 @ paletteTag
.4byte gUnknown_08524904
.4byte gUnknown_085E519C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0xd6f7, 0xd6f7, gUnknown_08524904, gUnknown_085E519C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_085E5310:: @ 85E5310
@ -212,13 +140,7 @@ gUnknown_085E5310:: @ 85E5310
.2byte 0x0100, 0x0503, 0x0506, 0x0004
.align 2
.2byte 0x281d @ tileTag
.2byte 0x281d @ paletteTag
.4byte gUnknown_0852490C
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_817330C
spr_template 0x281d, 0x281d, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_817330C
.align 2
gUnknown_085E5350:: @ 8535350
@ -229,11 +151,5 @@ gUnknown_085E5358:: @ 8535358
.4byte gUnknown_085E5350
.align 2
.2byte 0x274a @ tileTag
.2byte 0x274a @ paletteTag
.4byte gUnknown_08524914
.4byte gUnknown_085E5358
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_817330C
spr_template 0x274a, 0x274a, gUnknown_08524914, gUnknown_085E5358, NULL, gDummySpriteAffineAnimTable, sub_817330C

120
data/battle_controller_safari.s
View File

@ -75,31 +75,13 @@ gUnknown_085CE01C:: @ 85CE01C
.align 2
gUnknown_085CE020:: @ 85CE020
.2byte 0x2799 @ tileTag
.2byte 0x2799 @ paletteTag
.4byte gUnknown_08524A34
.4byte gUnknown_085CE01C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_80A77C8
spr_template 0x2799, 0x2799, gUnknown_08524A34, gUnknown_085CE01C, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
.align 2
.2byte 0x2720 @ tileTag
.2byte 0x2720 @ paletteTag
.4byte gUnknown_08524934
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815A0D4
spr_template 0x2720, 0x2720, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A0D4
.align 2
.2byte 0x2721 @ tileTag
.2byte 0x2721 @ paletteTag
.4byte gUnknown_08524904
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_80A78AC
spr_template 0x2721, 0x2721, gUnknown_08524904, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80A78AC
.align 2
gUnknown_085CE068:: @ 85CE068
@ -112,31 +94,13 @@ gUnknown_085CE078:: @ 85CE078
.align 2
gUnknown_085CE07C:: @ 85CE07C
.2byte 0x27ce @ tileTag
.2byte 0x27ce @ paletteTag
.4byte gUnknown_08524914
.4byte gUnknown_085CE078
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_80A77C8
spr_template 0x27ce, 0x27ce, gUnknown_08524914, gUnknown_085CE078, NULL, gDummySpriteAffineAnimTable, sub_80A77C8
.align 2
.2byte 0x27cf @ tileTag
.2byte 0x27cf @ paletteTag
.4byte gUnknown_08524A3C
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815A1B0
spr_template 0x27cf, 0x27cf, gUnknown_08524A3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A1B0
.align 2
.2byte 0x27cd @ tileTag
.2byte 0x27cd @ paletteTag
.4byte gUnknown_08524974
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815A254
spr_template 0x27cd, 0x27cd, gUnknown_08524974, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A254
.align 2
gUnknown_085CE0C4:: @ 85CE0C4
@ -158,22 +122,10 @@ gUnknown_085CE0FC:: @ 85CE0FC
.align 2
gUnknown_085CE104:: @ 85CE104
.2byte 0x27cb @ tileTag
.2byte 0x27cb @ paletteTag
.4byte gUnknown_08524AFC
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gUnknown_085CE0FC
.4byte sub_815A2F0
spr_template 0x27cb, 0x27cb, gUnknown_08524AFC, gDummySpriteAnimTable, NULL, gUnknown_085CE0FC, sub_815A2F0
.align 2
.2byte 0x27a8 @ tileTag
.2byte 0x27a8 @ paletteTag
.4byte gUnknown_0852490C
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815A6C4
spr_template 0x27a8, 0x27a8, gUnknown_0852490C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815A6C4
.align 2
gUnknown_085CE134:: @ 85CE134
@ -187,13 +139,7 @@ gUnknown_085CE14C:: @ 85CE14C
.align 2
gUnknown_085CE150:: @ 85CE150
.2byte 0x272b @ tileTag
.2byte 0x272b @ paletteTag
.4byte gUnknown_08524914
.4byte gUnknown_085CE14C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815A7B0
spr_template 0x272b, 0x272b, gUnknown_08524914, gUnknown_085CE14C, NULL, gDummySpriteAffineAnimTable, sub_815A7B0
.align 2
gUnknown_085CE168:: @ 85CE168
@ -215,13 +161,7 @@ gUnknown_085CE18C:: @ 85CE18C
.align 2
gUnknown_085CE190:: @ 85CE190
.2byte 0x27f4 @ tileTag
.2byte 0x27f4 @ paletteTag
.4byte gUnknown_08524974
.4byte gUnknown_085CE170
.4byte NULL
.4byte gUnknown_085CE18C
.4byte sub_815A7EC
spr_template 0x27f4, 0x27f4, gUnknown_08524974, gUnknown_085CE170, NULL, gUnknown_085CE18C, sub_815A7EC
.align 2
gUnknown_085CE1A8:: @ 85CE1A8
@ -243,13 +183,7 @@ gUnknown_085CE1D8:: @ 85CE1D8
.align 2
gUnknown_085CE1DC:: @ 85CE1DC
.2byte 0x27d0 @ tileTag
.2byte 0x27d0 @ paletteTag
.4byte gUnknown_085249D4
.4byte gUnknown_085CE1BC
.4byte NULL
.4byte gUnknown_085CE1D8
.4byte sub_815A8AC
spr_template 0x27d0, 0x27d0, gUnknown_085249D4, gUnknown_085CE1BC, NULL, gUnknown_085CE1D8, sub_815A8AC
.align 2
gUnknown_085CE1F4:: @ 85CE1F4
@ -270,31 +204,13 @@ gUnknown_085CE224:: @ 85CE224
.align 2
gUnknown_085CE22C:: @ 85CE22C
.2byte 0x27f3 @ tileTag
.2byte 0x27f3 @ paletteTag
.4byte gUnknown_085249DC
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gUnknown_085CE224
.4byte sub_815A934
spr_template 0x27f3, 0x27f3, gUnknown_085249DC, gDummySpriteAnimTable, NULL, gUnknown_085CE224, sub_815A934
.align 2
.2byte 0x2807 @ tileTag
.2byte 0x2807 @ paletteTag
.4byte gUnknown_08524914
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815AAA4
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815AAA4
.align 2
.2byte 0x2807 @ tileTag
.2byte 0x2807 @ paletteTag
.4byte gUnknown_08524914
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815ABD0
spr_template 0x2807, 0x2807, gUnknown_08524914, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_815ABD0
.align 2
gUnknown_085CE274:: @ 85CE274
@ -307,12 +223,6 @@ gUnknown_085CE284:: @ 85CE284
.align 2
gUnknown_085CE288:: @ 85CE288
.2byte 0x27f5 @ tileTag
.2byte 0x27f5 @ paletteTag
.4byte gUnknown_08524934
.4byte gUnknown_085CE284
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_815ACD0
spr_template 0x27f5, 0x27f5, gUnknown_08524934, gUnknown_085CE284, NULL, gDummySpriteAffineAnimTable, sub_815ACD0

69
data/battle_scripts_2.s
View File

@ -5,16 +5,45 @@
.align 2
gUnknown_082DBD08:: @ 82DBD08
.incbin "baserom.gba", 0x2dbd08, 0x34
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD7E
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.4byte gUnknown_082DBD68
.align 2
gUnknown_082DBD3C:: @ 82DBD3C
.incbin "baserom.gba", 0x2dbd3c, 0x18
.4byte gUnknown_082DBE12
.4byte gUnknown_082DBE1C
.4byte gUnknown_082DBE1C
.4byte gUnknown_082DBE4B
.4byte gUnknown_082DBE6F
.4byte gUnknown_082DBE91
.align 2
gUnknown_082DBD54:: @ 82DBD54
.incbin "baserom.gba", 0x2dbd54, 0x4
.4byte gUnknown_082DBEB3
.align 2
gUnknown_082DBD58:: @ 82DBD58
.incbin "baserom.gba", 0x2dbd58, 0x2c
.4byte gUnknown_082DBEBD
.4byte gUnknown_082DBEC4
.4byte gUnknown_082DBECD
.4byte gUnknown_082DBEE3
gUnknown_082DBD68:: @ 82DBD68
.incbin "baserom.gba", 0x2dbd68, 0x16
gUnknown_082DBD7E:: @ 82DBD7E
.incbin "baserom.gba", 0x2dbd7e, 0x6
gUnknown_082DBD84:: @ 82DBD84
.incbin "baserom.gba", 0x2dbd84, 0x46
@ -26,4 +55,34 @@ gUnknown_082DBDD4:: @ 82DBDD4
.incbin "baserom.gba", 0x2dbdd4, 0x2e
gUnknown_082DBE02:: @ 82DBE02
.incbin "baserom.gba", 0x2dbe02, 0xf6
.incbin "baserom.gba", 0x2dbe02, 0x10
gUnknown_082DBE12:: @ 82DBE12
.incbin "baserom.gba", 0x2dbe12, 0xa
gUnknown_082DBE1C:: @ 82DBE1C
.incbin "baserom.gba", 0x2dbe1c, 0x2f
gUnknown_082DBE4B:: @ 82DBE4B
.incbin "baserom.gba", 0x2dbe4b, 0x24
gUnknown_082DBE6F:: @ 82DBE6F
.incbin "baserom.gba", 0x2dbe6f, 0x22
gUnknown_082DBE91:: @ 82DBE91
.incbin "baserom.gba", 0x2dbe91, 0x22
gUnknown_082DBEB3:: @ 82DBEB3
.incbin "baserom.gba", 0x2dbeb3, 0xA
gUnknown_082DBEBD:: @ 82DBEBD
.incbin "baserom.gba", 0x2dbebd, 0x7
gUnknown_082DBEC4:: @ 82DBEC4
.incbin "baserom.gba", 0x2dbec4, 0x9
gUnknown_082DBECD:: @ 82DBECD
.incbin "baserom.gba", 0x2dbecd, 0x16
gUnknown_082DBEE3:: @ 82DBEE3
.incbin "baserom.gba", 0x2dbee3, 0x15

BIN
data/berry_fix.mb Normal file
View File

Binary file not shown.

20
data/berry_tag_screen.s
View File

@ -5,17 +5,27 @@
.align 2
gUnknown_085EFCF0:: @ 85EFCF0
.incbin "baserom.gba", 0x5efcf0, 0x10
.4byte 0x000001f0, 0x000011e1, 0x000021d2, 0x000031c3
.align 2
gUnknown_085EFD00:: @ 85EFD00
.incbin "baserom.gba", 0x5efd00, 0x20
.incbin "graphics/interface/berry_tag_screen.gbapal"
gUnknown_085EFD20:: @ 85EFD20
.incbin "baserom.gba", 0x5efd20, 0x8
.align 2
gUnknown_085EFD20:: @ 85EFD20 struct TextColor
.byte 0x00, 0x02, 0x03
.byte 0x0F, 0x0E, 0x0D
.align 2
gUnknown_085EFD28:: @ 85EFD28
.incbin "baserom.gba", 0x5efd28, 0x28
window_template 0x01, 0x0b, 0x04, 0x08, 0x02, 0x0f, 0x0045
window_template 0x01, 0x0b, 0x07, 0x12, 0x04, 0x0f, 0x0055
window_template 0x01, 0x04, 0x0e, 0x19, 0x04, 0x0f, 0x009d
window_template 0x00, 0x02, 0x00, 0x08, 0x02, 0x0f, 0x0101
window_template_terminator
.align 2
gBerryFirmnessStringPointers:: @ 85EFD50
.4byte gBerryFirmnessString_VerySoft
.4byte gBerryFirmnessString_Soft

11
data/braille_puzzles.s
View File

@ -3,5 +3,14 @@
.section .rodata
.align 2
gUnknown_085EFE74:: @ 85EFE74
.incbin "baserom.gba", 0x5efe74, 0x48
.byte 0x04, 0x15, 0x05, 0x15, 0x06, 0x15, 0x07, 0x15
.byte 0x08, 0x15, 0x09, 0x15, 0x0a, 0x15, 0x0b, 0x15
.byte 0x0c, 0x15, 0x0c, 0x16, 0x0c, 0x17, 0x0d, 0x17
.byte 0x0d, 0x18, 0x0d, 0x19, 0x0d, 0x1a, 0x0d, 0x1b
.byte 0x0c, 0x1b, 0x0c, 0x1c, 0x04, 0x1d, 0x05, 0x1d
.byte 0x06, 0x1d, 0x07, 0x1d, 0x08, 0x1d, 0x09, 0x1d
.byte 0x0a, 0x1d, 0x0b, 0x1d, 0x0c, 0x1d, 0x04, 0x1c
.byte 0x04, 0x1b, 0x03, 0x1b, 0x03, 0x1a, 0x03, 0x19
.byte 0x03, 0x18, 0x03, 0x17, 0x04, 0x17, 0x04, 0x16

108
data/cable_car.s
View File

@ -3,47 +3,103 @@
.section .rodata
.align 2
gUnknown_085CD66C:: @ 85CD66C
.incbin "baserom.gba", 0x5cd66c, 0x10
.4byte 0x000011c0, 0x000021d1, 0x000031e2, 0x000001f3
gUnknown_085CD67C:: @ 85CD67C
.incbin "baserom.gba", 0x5cd67c, 0x158
.align 2
gCableCarMtChimneyTilemap:: @ 85CD67C
.incbin "graphics/misc/cable_car_mt_chimney_map.bin.lz"
gUnknown_085CD7D4:: @ 85CD7D4
.incbin "baserom.gba", 0x5cd7d4, 0x184
.align 2
gCableCarTreeTilemap:: @ 85CD7D4
.incbin "graphics/misc/cable_car_tree_map.bin.lz"
gUnknown_085CD958:: @ 85CD958
.incbin "baserom.gba", 0x5cd958, 0x1c4
.align 2
gCableCarMountainTilemap:: @ 85CD958
.incbin "graphics/misc/cable_car_mountain_map.bin.lz"
gUnknown_085CDB1C:: @ 85CDB1C
.incbin "baserom.gba", 0x5cdb1c, 0x14
.align 2
gCableCarPylonHookTilemapEntries:: @ 85CDB1C
.2byte 0x3000
.2byte 0x3001
.2byte 0x3002
.2byte 0x3003
.2byte 0x3004
.2byte 0x3005
.2byte 0x3006
.2byte 0x3007
.2byte 0x3008
.2byte 0x3009
gUnknown_085CDB30:: @ 85CDB30
.incbin "baserom.gba", 0x5cdb30, 0x24
.align 2
gCableCarPylonStemTilemap:: @ 85CDB30
.incbin "graphics/misc/cable_car_pylon_stem_map.bin.lz"
.align 2
gUnknown_085CDB54:: @ 85CDB54
.incbin "baserom.gba", 0x5cdb54, 0x20
obj_tiles gCableCar_Gfx, 0x800, 1
obj_tiles gCableCarDoor_Gfx, 0x40, 2
obj_tiles gCableCarCord_Gfx, 0x80, 3
null_obj_tiles
.align 2
gUnknown_085CDB74:: @ 85CDB74
.incbin "baserom.gba", 0x5cdb74, 0x28
obj_pal gCableCar_Pal, 1
null_obj_pal
gUnknown_085CDB9C:: @ 85CDB9C
.incbin "baserom.gba", 0x5cdb9c, 0x30
.align 2
gOamData_85CDB84:: @ 85CDB84
.2byte 0x0300
.2byte 0xC000
.2byte 0x0800
gUnknown_085CDBCC:: @ 85CDBCC
.incbin "baserom.gba", 0x5cdbcc, 0x18
.align 2
gOamData_85CDB8C:: @ 85CDB8C
.2byte 0x4300
.2byte 0x0000
.2byte 0x0800
gUnknown_085CDBE4:: @ 85CDBE4
.incbin "baserom.gba", 0x5cdbe4, 0x2
.align 2
gOamData_85CDB94:: @ 85CDB94
.2byte 0x0300
.2byte 0x4000
.2byte 0x0800
gUnknown_085CDBE6:: @ 85CDBE6
.incbin "baserom.gba", 0x5cdbe6, 0x4
.align 2
gSpriteTemplate_85CDB9C:: @ 85CDB9C
spr_template 1, 1, gOamData_85CDB84, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8150868
gUnknown_085CDBEA:: @ 85CDBEA
.incbin "baserom.gba", 0x5cdbea, 0x8
.align 2
gSpriteTemplate_85CDBB4:: @ 85CDBB4
spr_template 2, 1, gOamData_85CDB8C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8150868
gUnknown_085CDBF2:: @ 85CDBF2
.incbin "baserom.gba", 0x5cdbf2, 0x6
.align 2
gSpriteTemplate_85CDBCC:: @ 85CDBCC
spr_template 3, 1, gOamData_85CDB94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_58
gCableCarPlayerGraphicsIDs:: @ 85CDBE4
.byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
.byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL
gMtChimneyHikerGraphicsIDs:: @ 85CDBE6
.byte MAP_OBJ_GFX_HIKER
.byte MAP_OBJ_GFX_CAMPER
.byte MAP_OBJ_GFX_PICNICKER
.byte MAP_OBJ_GFX_ZIGZAGOON @ not used
.align 1
gMtChimneyHikerCoords:: @ 85CDBEA
.2byte 0, 80
.2byte 240, 146
gMtChimneyHikerMovementDelayTable:: @ 85CDBF2
.byte 0
.byte 60
.byte 120
.byte 170
.align 2
gUnknown_085CDBF8:: @ 85CDBF8
.incbin "baserom.gba", 0x5cdbf8, 0x8
.4byte sub_8150A68
.4byte sub_8150AF4

10
data/clear_save_data_screen.s
View File

@ -3,11 +3,15 @@
.section .rodata
.align 2
gUnknown_085F06C0:: @ 85F06C0
.incbin "baserom.gba", 0x5f06c0, 0x8
.4byte 0x000001f0, 0x000011e3
.align 2
gUnknown_085F06C8:: @ 85F06C8
.incbin "baserom.gba", 0x5f06c8, 0x10
window_template 0x00, 0x03, 0x0f, 0x1a, 0x04, 0x0f, 0x000b
window_template_terminator
.align 2
gUnknown_085F06D8:: @ 85F06D8
.incbin "baserom.gba", 0x5f06d8, 0x8
window_template 0x00, 0x03, 0x02, 0x05, 0x04, 0x0f, 0x0073

139
data/contest_ai.s
View File

@ -3,5 +3,142 @@
.section .rodata
.align 2
gUnknown_085CDD00:: @ 85CDD00
.incbin "baserom.gba", 0x5cdd00, 0x220
.4byte sub_81564DC
.4byte sub_8156530
.4byte sub_8156550
.4byte sub_8156594
.4byte sub_81565D8
.4byte sub_815661C
.4byte sub_8156660
.4byte sub_8156684
.4byte sub_81566C8
.4byte sub_815670C
.4byte sub_8156750
.4byte sub_8156794
.4byte sub_81567BC
.4byte sub_8156800
.4byte sub_8156844
.4byte sub_8156888
.4byte sub_81568CC
.4byte sub_815690C
.4byte sub_8156950
.4byte sub_8156994
.4byte sub_81569D8
.4byte sub_8156A1C
.4byte sub_8156A48
.4byte sub_8156A98
.4byte sub_8156AE8
.4byte sub_8156B38
.4byte sub_8156B88
.4byte sub_8156BB4
.4byte sub_8156C04
.4byte sub_8156C54
.4byte sub_8156CA4
.4byte sub_8156CF4
.4byte sub_8156D18
.4byte sub_8156D5C
.4byte sub_8156DA0
.4byte sub_8156DE4
.4byte sub_8156E2C
.4byte sub_8156E74
.4byte sub_8156EBC
.4byte sub_8156F04
.4byte sub_8156F44
.4byte sub_8156F88
.4byte sub_8156FCC
.4byte sub_8157018
.4byte sub_815705C
.4byte sub_81570A0
.4byte sub_815712C
.4byte sub_8157174
.4byte sub_8157200
.4byte sub_8157248
.4byte sub_81572A4
.4byte sub_81572E8
.4byte sub_815732C
.4byte sub_8157370
.4byte sub_81573B4
.4byte sub_8157410
.4byte sub_8157454
.4byte sub_8157498
.4byte sub_81574DC
.4byte sub_8157520
.4byte sub_8157578
.4byte sub_81575BC
.4byte sub_8157600
.4byte sub_8157644
.4byte sub_8157688
.4byte sub_8157700
.4byte sub_8157748
.4byte sub_8157790
.4byte sub_8157808
.4byte sub_8157850
.4byte sub_8157898
.4byte sub_81578F8
.4byte sub_8157940
.4byte sub_8157988
.4byte sub_81579CC
.4byte sub_8157A10
.4byte sub_8157A54
.4byte sub_8157A98
.4byte sub_8157ADC
.4byte sub_8157B38
.4byte sub_8157B7C
.4byte sub_8157BC0
.4byte sub_8157C04
.4byte sub_8157C48
.4byte sub_8157C94
.4byte sub_8157CDC
.4byte sub_8157D24
.4byte sub_8157D60
.4byte sub_8157DA8
.4byte sub_8157DF0
.4byte sub_8157E3C
.4byte sub_8157E84
.4byte sub_8157ECC
.4byte sub_8157F14
.4byte sub_8157F5C
.4byte sub_8157FA0
.4byte sub_8157FE8
.4byte sub_8158030
.4byte sub_8158078
.4byte sub_81580C0
.4byte sub_8158108
.4byte sub_815814C
.4byte sub_8158190
.4byte sub_81581D4
.4byte sub_8158218
.4byte sub_8158254
.4byte sub_8158298
.4byte sub_81582DC
.4byte sub_8158320
.4byte sub_8158364
.4byte sub_81583B8
.4byte sub_81583FC
.4byte sub_8158440
.4byte sub_815846C
.4byte sub_815849C
.4byte sub_81584D4
.4byte sub_8158508
.4byte sub_815853C
.4byte sub_815858C
.4byte sub_81585DC
.4byte sub_815862C
.4byte sub_815867C
.4byte sub_81586D0
.4byte sub_8158724
.4byte sub_8158778
.4byte sub_81587CC
.4byte sub_815881C
.4byte sub_815886C
.4byte dp15_call
.4byte sub_81588BC
.4byte sub_8158948
.4byte sub_81589A4
.4byte sub_81589EC
.4byte sub_8158A34
.4byte sub_8158AA0
.4byte sub_8158AE8

1559
data/credits.s
View File

File diff suppressed because it is too large Load Diff

22
data/graphics.s
View File

@ -645,11 +645,29 @@ gUnknown_08DAAFEC:: @ 8DAAFEC
.incbin "baserom.gba", 0xdb7aa0, 0x2a78
gUnknown_08DBA518:: @ 8DBA518
.incbin "baserom.gba", 0xdba518, 0xa0
.incbin "baserom.gba", 0xdba518, 0x80
.align 2
gCableCar_Pal:: @ 8DBA598
.incbin "graphics/misc/cable_car.gbapal"
.align 2
gUnknown_08DBA5B8:: @ 8DBA5B8
.incbin "baserom.gba", 0xdba5b8, 0x1d30
.incbin "baserom.gba", 0xdba5b8, 0x19d8
.align 2
gCableCar_Gfx:: @ 8DBBF90
.incbin "graphics/misc/cable_car.4bpp.lz"
.align 2
gCableCarDoor_Gfx:: @ 8DBC290
.incbin "graphics/misc/cable_car_door.4bpp.lz"
.align 2
gCableCarCord_Gfx:: @ 8DBC2C0
.incbin "graphics/misc/cable_car_cord.4bpp.lz"
.align 2
gUnknown_08DBC2E8:: @ 8DBC2E8
.incbin "baserom.gba", 0xdbc2e8, 0x72c

526
data/link.s
View File

@ -54,24 +54,26 @@ gUnknown_082ED1FC:: @ 82ED1FC BgTemplate
.4byte 0x000001F8
.4byte 0x00001081
.align 2
gUnknown_082ED204:: @ 82ED204
window_template 0x00, 0x00, 0x00, 0x1E, 0x05, 0x0F, 0x0002
window_template 0x00, 0x00, 0x06, 0x1E, 0x07, 0x0F, 0x0098
window_template 0x00, 0x00, 0x0D, 0x1E, 0x07, 0x0F, 0x016A
window_template 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
window_template_terminator
.align 2
gUnknown_082ED224:: @ 82ED224
.byte 0x00, 0x01, 0x02, 0x00, 0xff, 0xfe, 0xff, 0x00
.align 2
gWirelessLinkIconPalette:: @ 82ED22C
.incbin "graphics/interface/wireless_link_icon.gbapal"
.align 2
gWirelessLinkIconPic:: @ 82ED22C
.incbin "graphics/interface/wireless_link_icon.4bpp.lz"
.align 2
gUnknown_082ED370:: @ 82ED370
.byte 0xff, 0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37
.byte 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f
@ -106,6 +108,7 @@ gUnknown_082ED370:: @ 82ED370
.byte 0x2c, 0x2e, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c
.byte 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94
.align 2
gUnknown_082ED470:: @ 82ED470
.byte 0x20, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c
.byte 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94
@ -140,26 +143,33 @@ gUnknown_082ED470:: @ 82ED470
.byte 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x20
.byte 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00
.align 2
gUnknown_082ED570:: @ 82ED570
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_082ED578:: @ 82ED578
.2byte 0x0004, 0x0005, 0x0008, 0x0005, 0x000c, 0x0005, 0x0010, 0x000a
.2byte 0x000c, 0x0005, 0x0008, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_082ED594:: @ 82ED594
.2byte 0x0004, 0x0005, 0x0008, 0x0005, 0x000c, 0x000a, 0x0008, 0x0005
.2byte 0xfffe, 0x0000
.align 2
gUnknown_082ED5A8:: @ 82ED5A8
.2byte 0x0004, 0x0005, 0x0008, 0x0005, 0xfffe, 0x0000
.align 2
gUnknown_082ED5B4:: @ 82ED5B4
.2byte 0x0004, 0x000a, 0x0014, 0x000a, 0xfffe, 0x0000
.align 2
gUnknown_082ED5C0:: @ 82ED5C0
.2byte 0x0018, 0x000a, 0x0004, 0x000a, 0xfffe, 0x0000
.align 2
gUnknown_082ED5CC:: @ 82ED5CC
.4byte gUnknown_082ED578
.4byte gUnknown_082ED594
@ -167,33 +177,29 @@ gUnknown_082ED5CC:: @ 82ED5CC
.4byte gUnknown_082ED5B4
.4byte gUnknown_082ED5C0
gUnknown_082ED5E0:: @ 82ED5E0 struct CompressedSpriteSheet
.4byte gWirelessLinkIconPic
.2byte 0x0380 @ uncompressed size
.2byte 0xD431 @ tag
.align 2
gUnknown_082ED5E0:: @ 82ED5E0
obj_tiles gWirelessLinkIconPic, 0x0380, 0xD431
gUnknown_082ED5E8:: @ 82ED5E8 struct SpritePalette
.4byte gWirelessLinkIconPalette
.2byte 0xD432 @ tag
.2byte 0x0000 @ padding
.align 2
gUnknown_082ED5E8:: @ 82ED5E8
obj_pal gWirelessLinkIconPalette, 0xD432
gUnknown_082ED5F0:: @ 82ED5F0 struct SpriteTemplate
.2byte 0xD431 @ tileTag
.2byte 0xD432 @ paletteTag
.4byte gUnknown_082ED570
.4byte gUnknown_082ED5CC
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
.align 2
gUnknown_082ED5F0:: @ 82ED5F0
spr_template 0xD431, 0xD432, gUnknown_082ED570, gUnknown_082ED5CC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082ED608:: @ 82ED608
.byte 0x04, 0x20, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00
.byte 0x14, 0x2b, 0x02, 0x02, 0x22, 0x2b, 0x02, 0x02
.byte 0x01, 0x00, 0x58, 0x02, 0x2c, 0x01, 0x00, 0x00
.align 2
gUnknown_082ED620:: @ 82ED620
.byte 0x00, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00
.align 2
gUnknown_082ED628:: @ 82ED628
.4byte 0x00000000, 0x00000001, 0x00000003, 0x00000007
.4byte 0x0000000f, 0x0000001f, 0x0000003f, 0x0000007f
@ -216,6 +222,7 @@ gUnknown_082ED6A5:: @ 82ED6A5
.byte 0x03, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x00
.byte 0x00, 0x00, 0x00
.align 2
gUnknown_082ED6B8:: @ 82ED6B8
.4byte gUnknown_020228C4
.4byte 0x000000c8
@ -228,6 +235,7 @@ gUnknown_082ED6B8:: @ 82ED6B8
.4byte gUnknown_020228C4
.4byte 0x00000028
.align 2
gUnknown_082ED6E0:: @ 82ED6E0
.2byte 0x0002, 0x7f7d, 0x0000, 0xffff
@ -285,6 +293,7 @@ gUnknown_082ED7E0:: @ 82ED7E0
.4byte sub_8010AAC
.4byte sub_8010D0C
.align 2
gUnknown_082ED7EC:: @ 82ED7EC
.ascii "PokemonSioInfo"
@ -1877,7 +1886,7 @@ gUnknown_082F05A8:: @ 82F05A8
window_template 0x00, 0x00, 0x00, 0x1e, 0x02, 0x0c, 0x0013
window_template 0x00, 0x01, 0x0f, 0x1c, 0x04, 0x0c, 0x004f
window_template 0x00, 0x00, 0x0f, 0x1e, 0x05, 0x0d, 0x004f
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
window_template_terminator
.align 2
gUnknown_082F05C8:: @ 82F05C8
@ -2061,7 +2070,7 @@ gUnknown_082F0D3C:: @ 82F0D3C
window_template 0x00, 0x03, 0x00, 0x18, 0x03, 0x0f, 0x0001
window_template 0x00, 0x03, 0x04, 0x15, 0x0f, 0x0f, 0x0049
window_template 0x00, 0x18, 0x04, 0x03, 0x0f, 0x0f, 0x0184
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
window_template_terminator
.align 2
gUnknown_082F0D5C:: @ 82F0D5C
@ -2093,7 +2102,7 @@ gUnknown_082F0DD0:: @ 82F0DD0
.align 2
gUnknown_082F0DD4:: @ 82F0DD4
window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0014
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
window_template_terminator
.align 2
gUnknown_082F0DE4:: @ 82F0DE4
@ -2268,14 +2277,8 @@ gUnknown_082F1D08:: @ 82F1D08 struct SpritePalette
.2byte 0x8000
.align 2
gUnknown_082F1D48:: @ 82F1D48 struct SpriteTemplate
.2byte 0x8000
.2byte 0x8000
.4byte gUnknown_08524934
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
gUnknown_082F1D48:: @ 82F1D48
spr_template 0x8000, 0x8000, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082F1D60:: @ 82F1D60
@ -2752,7 +2755,7 @@ gUnknown_082F2C70:: @ 82F2C70
window_template 0x01, 0x09, 0x12, 0x0f, 0x02, 0x0c, 0x007a
window_template 0x01, 0x00, 0x02, 0x06, 0x0f, 0x07, 0x0020
window_template 0x00, 0x01, 0x02, 0x07, 0x09, 0x0e, 0x0013
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
window_template_terminator
.align 2
gUnknown_082F2C98:: @ 82F2C98
@ -2895,13 +2898,7 @@ gUnknown_082F318C:: @ 82F318C
.align 2
gUnknown_082F319C:: @ 82F319C
.2byte 0x0000 @ tileTag
.2byte 0x0000 @ paletteTag
.4byte gUnknown_082F3164
.4byte gUnknown_082F318C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x0000, 0x0000, gUnknown_082F3164, gUnknown_082F318C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082F31B4:: @ 82F31B4
@ -2909,23 +2906,11 @@ gUnknown_082F31B4:: @ 82F31B4
.align 2
gUnknown_082F31BC:: @ 82F31BC
.2byte 0x0002 @ tileTag
.2byte 0x0000 @ paletteTag
.4byte gUnknown_082F31B4
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_8020ABC
spr_template 0x0002, 0x0000, gUnknown_082F31B4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8020ABC
.align 2
gUnknown_082F31D4:: @ 82F31D4
.2byte 0x0001 @ tileTag
.2byte 0x0000 @ paletteTag
.4byte gUnknown_082F31B4
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_8020AF4
spr_template 0x0001, 0x0000, gUnknown_082F31B4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8020AF4
.align 2
gUnknown_082F31EC:: @ 82F31EC
@ -2960,23 +2945,11 @@ gUnknown_082F321C:: @ 82F321C
.align 2
gUnknown_082F322C:: @ 82F322C
.2byte 0x0003 @ tileTag
.2byte 0x0000 @ paletteTag
.4byte gUnknown_082F31EC
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x0003, 0x0000, gUnknown_082F31EC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082F3244:: @ 82F3244
.2byte 0x0004 @ tileTag
.2byte 0x0000 @ paletteTag
.4byte gUnknown_082F31F4
.4byte gUnknown_082F321C
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x0004, 0x0000, gUnknown_082F31F4, gUnknown_082F321C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082F325C:: @ 82F325C
@ -3049,11 +3022,12 @@ gUnknown_082F32F4:: @ 82F32F4
window_template 0x00, 0x00, 0x06, 0x09, 0x02, 0x08, 0x03c9
window_template 0x00, 0x15, 0x03, 0x09, 0x02, 0x08, 0x03b7
window_template 0x00, 0x15, 0x06, 0x09, 0x02, 0x08, 0x03a5
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
window_template_terminator
window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
window_template 0x00, 0x04, 0x02, 0x16, 0x10, 0x0f, 0x0001
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
window_template_terminator
.align 2
gUnknown_082F3344:: @ 82F3344
@ -3243,53 +3217,23 @@ gUnknown_082F4304:: @ 82F4304
.align 2
gUnknown_082F430C:: @ 82F430C
.2byte 0x0001 @ tileTag
.2byte 0x0001 @ paletteTag
.4byte gUnknown_0852491C
.4byte gUnknown_082F42E8
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x0001, 0x0001, gUnknown_0852491C, gUnknown_082F42E8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082F4324:: @ 82F4324
.2byte 0x0002 @ tileTag
.2byte 0x0002 @ paletteTag
.4byte gUnknown_08524914
.4byte gUnknown_082F42EC
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_8022A20
spr_template 0x0002, 0x0002, gUnknown_08524914, gUnknown_082F42EC, NULL, gDummySpriteAffineAnimTable, sub_8022A20
.align 2
gUnknown_082F433C:: @ 82F433C
.2byte 0x0003 @ tileTag
.2byte 0x0002 @ paletteTag
.4byte gUnknown_0852490C
.4byte gUnknown_082F42F4
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x0003, 0x0002, gUnknown_0852490C, gUnknown_082F42F4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082F4354:: @ 82F4354
.2byte 0x0004 @ tileTag
.2byte 0x0004 @ paletteTag
.4byte gUnknown_08524944
.4byte gUnknown_082F42FC
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x0004, 0x0004, gUnknown_08524944, gUnknown_082F42FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082F436C:: @ 82F436C
.2byte 0x0005 @ tileTag
.2byte 0x0005 @ paletteTag
.4byte gUnknown_085249D4
.4byte gUnknown_082F4300
.4byte NULL
.4byte gUnknown_082F4304
.4byte SpriteCallbackDummy
spr_template 0x0005, 0x0005, gUnknown_085249D4, gUnknown_082F4300, NULL, gUnknown_082F4304, SpriteCallbackDummy
.align 2
gUnknown_082F4384:: @ 82F4384
@ -3915,28 +3859,19 @@ gUnknown_082FB2D4:: @ 82FB2D4
.align 2
gUnknown_082FB2D8:: @ 82FB2D8
.4byte gDodrioBerryPkmnPal
.2byte 0x0000
obj_pal gDodrioBerryPkmnPal, 0x0000
.align 2
gUnknown_082FB2E0:: @ 82FB2E0
.4byte gDodrioBerryShinyPal
.2byte 0x0001
obj_pal gDodrioBerryShinyPal, 0x0001
.align 2
gUnknown_082FB2E8:: @ 82FB2E8
.4byte gDodrioBerryStatusPal
.2byte 0x0002
obj_pal gDodrioBerryStatusPal, 0x0002
.align 2
gUnknown_082FB2F0:: @ 82FB2F0 struct SpriteTemplate
.2byte 0x0001 @ tileTag
.2byte 0x0002 @ paletteTag
.4byte gUnknown_082FB1E8
.4byte gUnknown_082FB254
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte nullsub_15
gUnknown_082FB2F0:: @ 82FB2F0
spr_template 0x0001, 0x0002, gUnknown_082FB1E8, gUnknown_082FB254, NULL, gDummySpriteAffineAnimTable, nullsub_15
.align 2
.byte 0xD4, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44
@ -3944,32 +3879,19 @@ gUnknown_082FB2F0:: @ 82FB2F0 struct SpriteTemplate
.align 2
gUnknown_082FB314:: @ 82FB314
.4byte gDodrioBerrySpritesPal
.2byte 0x0003
obj_pal gDodrioBerrySpritesPal, 0x0003
.align 2
gUnknown_082FB31C:: @ 82FB31C
.2byte 0x0058, 0x0080, 0x00a8, 0x00d0
.align 2
gUnknown_082FB324:: @ 82FB324 struct SpriteTemplate
.2byte 0x0002 @ tileTag
.2byte 0x0003 @ paletteTag
.4byte gUnknown_082FB1F0
.4byte gUnknown_082FB2A8
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
gUnknown_082FB324:: @ 82FB324
spr_template 0x0002, 0x0003, gUnknown_082FB1F0, gUnknown_082FB2A8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082FB33C:: @ 82FB33C struct SpriteTemplate
.2byte 0x0002 @ tileTag
.2byte 0x0003 @ paletteTag
.4byte gUnknown_082FB1E8
.4byte gUnknown_082FB2A8
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
gUnknown_082FB33C:: @ 82FB33C
spr_template 0x0002, 0x0003, gUnknown_082FB1E8, gUnknown_082FB2A8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082FB354:: @ 82FB354
@ -3984,18 +3906,11 @@ gUnknown_082FB358:: @ 82FB358
.align 2
gUnknown_082FB360:: @ 82FB360
.4byte gDodrioBerryPlatformPal
.2byte 0x0006
obj_pal gDodrioBerryPlatformPal, 0x0006
.align 2
gUnknown_082FB368:: @ 82FB368 struct SpriteTemplate
.2byte 0x0005 @ tileTag
.2byte 0x0006 @ paletteTag
.4byte gUnknown_082FB1F8
.4byte gUnknown_082FB2D4
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte sub_8028CF4
gUnknown_082FB368:: @ 82FB368
spr_template 0x0005, 0x0006, gUnknown_082FB1F8, gUnknown_082FB2D4, NULL, gDummySpriteAffineAnimTable, sub_8028CF4
.align 2
gUnknown_082FB380:: @ 82FB380
@ -4075,106 +3990,106 @@ gUnknown_082FB45C:: @ 82FB45C
.align 2
gPkmnJumpSpecies:: @ 82FB464
.2byte SPECIES_BULBASAUR, 0x0002
.2byte SPECIES_CHARMANDER, 0x0001
.2byte SPECIES_SQUIRTLE, 0x0000
.2byte SPECIES_CATERPIE, 0x0001
.2byte SPECIES_METAPOD, 0x0001
.2byte SPECIES_WEEDLE, 0x0001
.2byte SPECIES_KAKUNA, 0x0001
.2byte SPECIES_RATTATA, 0x0001
.2byte SPECIES_RATICATE, 0x0001
.2byte SPECIES_PIKACHU, 0x0000
.2byte SPECIES_SANDSHREW, 0x0000
.2byte SPECIES_NIDORAN_F, 0x0000
.2byte SPECIES_NIDORAN_M, 0x0000
.2byte SPECIES_CLEFAIRY, 0x0000
.2byte SPECIES_VULPIX, 0x0000
.2byte SPECIES_JIGGLYPUFF, 0x0002
.2byte SPECIES_ODDISH, 0x0002
.2byte SPECIES_PARAS, 0x0001
.2byte SPECIES_MEOWTH, 0x0000
.2byte SPECIES_PSYDUCK, 0x0002
.2byte SPECIES_MANKEY, 0x0001
.2byte SPECIES_GROWLITHE, 0x0001
.2byte SPECIES_POLIWAG, 0x0002
.2byte SPECIES_BELLSPROUT, 0x0002
.2byte SPECIES_SHELLDER, 0x0001
.2byte SPECIES_KRABBY, 0x0001
.2byte SPECIES_EXEGGCUTE, 0x0002
.2byte SPECIES_CUBONE, 0x0000
.2byte SPECIES_DITTO, 0x0002
.2byte SPECIES_EEVEE, 0x0000
.2byte SPECIES_OMANYTE, 0x0001
.2byte SPECIES_KABUTO, 0x0001
.2byte SPECIES_CHIKORITA, 0x0002
.2byte SPECIES_CYNDAQUIL, 0x0001
.2byte SPECIES_TOTODILE, 0x0000
.2byte SPECIES_SPINARAK, 0x0001
.2byte SPECIES_PICHU, 0x0000
.2byte SPECIES_CLEFFA, 0x0000
.2byte SPECIES_IGGLYBUFF, 0x0002
.2byte SPECIES_TOGEPI, 0x0002
.2byte SPECIES_MAREEP, 0x0000
.2byte SPECIES_BELLOSSOM, 0x0002
.2byte SPECIES_MARILL, 0x0002
.2byte SPECIES_SUNKERN, 0x0002
.2byte SPECIES_WOOPER, 0x0002
.2byte SPECIES_PINECO, 0x0002
.2byte SPECIES_SNUBBULL, 0x0000
.2byte SPECIES_SHUCKLE, 0x0002
.2byte SPECIES_TEDDIURSA, 0x0000
.2byte SPECIES_SLUGMA, 0x0002
.2byte SPECIES_SWINUB, 0x0000
.2byte SPECIES_HOUNDOUR, 0x0001
.2byte SPECIES_PHANPY, 0x0000
.2byte SPECIES_PORYGON2, 0x0000
.2byte SPECIES_TYROGUE, 0x0001
.2byte SPECIES_SMOOCHUM, 0x0002
.2byte SPECIES_ELEKID, 0x0001
.2byte SPECIES_MAGBY, 0x0001
.2byte SPECIES_LARVITAR, 0x0001
.2byte SPECIES_TREECKO, 0x0001
.2byte SPECIES_TORCHIC, 0x0002
.2byte SPECIES_MUDKIP, 0x0000
.2byte SPECIES_MARSHTOMP, 0x0000
.2byte SPECIES_POOCHYENA, 0x0001
.2byte SPECIES_ZIGZAGOON, 0x0000
.2byte SPECIES_LINOONE, 0x0000
.2byte SPECIES_WURMPLE, 0x0001
.2byte SPECIES_SILCOON, 0x0002
.2byte SPECIES_CASCOON, 0x0002
.2byte SPECIES_LOTAD, 0x0002
.2byte SPECIES_SEEDOT, 0x0001
.2byte SPECIES_RALTS, 0x0000
.2byte SPECIES_KIRLIA, 0x0000
.2byte SPECIES_SURSKIT, 0x0002
.2byte SPECIES_SHROOMISH, 0x0002
.2byte SPECIES_NINCADA, 0x0001
.2byte SPECIES_WHISMUR, 0x0000
.2byte SPECIES_AZURILL, 0x0002
.2byte SPECIES_SKITTY, 0x0000
.2byte SPECIES_SABLEYE, 0x0000
.2byte SPECIES_MAWILE, 0x0000
.2byte SPECIES_ARON, 0x0001
.2byte SPECIES_MEDITITE, 0x0002
.2byte SPECIES_ELECTRIKE, 0x0001
.2byte SPECIES_PLUSLE, 0x0001
.2byte SPECIES_MINUN, 0x0001
.2byte SPECIES_VOLBEAT, 0x0000
.2byte SPECIES_ILLUMISE, 0x0000
.2byte SPECIES_ROSELIA, 0x0002
.2byte SPECIES_GULPIN, 0x0002
.2byte SPECIES_NUMEL, 0x0002
.2byte SPECIES_TORKOAL, 0x0002
.2byte SPECIES_SPOINK, 0x0000
.2byte SPECIES_TRAPINCH, 0x0002
.2byte SPECIES_CACNEA, 0x0002
.2byte SPECIES_ANORITH, 0x0001
.2byte SPECIES_WYNAUT, 0x0000
.2byte SPECIES_SNORUNT, 0x0000
.2byte SPECIES_CLAMPERL, 0x0001
.2byte SPECIES_BAGON, 0x0001
.2byte SPECIES_BULBASAUR, 0x0002
.2byte SPECIES_CHARMANDER, 0x0001
.2byte SPECIES_SQUIRTLE, 0x0000
.2byte SPECIES_CATERPIE, 0x0001
.2byte SPECIES_METAPOD, 0x0001
.2byte SPECIES_WEEDLE, 0x0001
.2byte SPECIES_KAKUNA, 0x0001
.2byte SPECIES_RATTATA, 0x0001
.2byte SPECIES_RATICATE, 0x0001
.2byte SPECIES_PIKACHU, 0x0000
.2byte SPECIES_SANDSHREW, 0x0000
.2byte SPECIES_NIDORAN_F, 0x0000
.2byte SPECIES_NIDORAN_M, 0x0000
.2byte SPECIES_CLEFAIRY, 0x0000
.2byte SPECIES_VULPIX, 0x0000
.2byte SPECIES_JIGGLYPUFF, 0x0002
.2byte SPECIES_ODDISH, 0x0002
.2byte SPECIES_PARAS, 0x0001
.2byte SPECIES_MEOWTH, 0x0000
.2byte SPECIES_PSYDUCK, 0x0002
.2byte SPECIES_MANKEY, 0x0001
.2byte SPECIES_GROWLITHE, 0x0001
.2byte SPECIES_POLIWAG, 0x0002
.2byte SPECIES_BELLSPROUT, 0x0002
.2byte SPECIES_SHELLDER, 0x0001
.2byte SPECIES_KRABBY, 0x0001
.2byte SPECIES_EXEGGCUTE, 0x0002
.2byte SPECIES_CUBONE, 0x0000
.2byte SPECIES_DITTO, 0x0002
.2byte SPECIES_EEVEE, 0x0000
.2byte SPECIES_OMANYTE, 0x0001
.2byte SPECIES_KABUTO, 0x0001
.2byte SPECIES_CHIKORITA, 0x0002
.2byte SPECIES_CYNDAQUIL, 0x0001
.2byte SPECIES_TOTODILE, 0x0000
.2byte SPECIES_SPINARAK, 0x0001
.2byte SPECIES_PICHU, 0x0000
.2byte SPECIES_CLEFFA, 0x0000
.2byte SPECIES_IGGLYBUFF, 0x0002
.2byte SPECIES_TOGEPI, 0x0002
.2byte SPECIES_MAREEP, 0x0000
.2byte SPECIES_BELLOSSOM, 0x0002
.2byte SPECIES_MARILL, 0x0002
.2byte SPECIES_SUNKERN, 0x0002
.2byte SPECIES_WOOPER, 0x0002
.2byte SPECIES_PINECO, 0x0002
.2byte SPECIES_SNUBBULL, 0x0000
.2byte SPECIES_SHUCKLE, 0x0002
.2byte SPECIES_TEDDIURSA, 0x0000
.2byte SPECIES_SLUGMA, 0x0002
.2byte SPECIES_SWINUB, 0x0000
.2byte SPECIES_HOUNDOUR, 0x0001
.2byte SPECIES_PHANPY, 0x0000
.2byte SPECIES_PORYGON2, 0x0000
.2byte SPECIES_TYROGUE, 0x0001
.2byte SPECIES_SMOOCHUM, 0x0002
.2byte SPECIES_ELEKID, 0x0001
.2byte SPECIES_MAGBY, 0x0001
.2byte SPECIES_LARVITAR, 0x0001
.2byte SPECIES_TREECKO, 0x0001
.2byte SPECIES_TORCHIC, 0x0002
.2byte SPECIES_MUDKIP, 0x0000
.2byte SPECIES_MARSHTOMP, 0x0000
.2byte SPECIES_POOCHYENA, 0x0001
.2byte SPECIES_ZIGZAGOON, 0x0000
.2byte SPECIES_LINOONE, 0x0000
.2byte SPECIES_WURMPLE, 0x0001
.2byte SPECIES_SILCOON, 0x0002
.2byte SPECIES_CASCOON, 0x0002
.2byte SPECIES_LOTAD, 0x0002
.2byte SPECIES_SEEDOT, 0x0001
.2byte SPECIES_RALTS, 0x0000
.2byte SPECIES_KIRLIA, 0x0000
.2byte SPECIES_SURSKIT, 0x0002
.2byte SPECIES_SHROOMISH, 0x0002
.2byte SPECIES_NINCADA, 0x0001
.2byte SPECIES_WHISMUR, 0x0000
.2byte SPECIES_AZURILL, 0x0002
.2byte SPECIES_SKITTY, 0x0000
.2byte SPECIES_SABLEYE, 0x0000
.2byte SPECIES_MAWILE, 0x0000
.2byte SPECIES_ARON, 0x0001
.2byte SPECIES_MEDITITE, 0x0002
.2byte SPECIES_ELECTRIKE, 0x0001
.2byte SPECIES_PLUSLE, 0x0001
.2byte SPECIES_MINUN, 0x0001
.2byte SPECIES_VOLBEAT, 0x0000
.2byte SPECIES_ILLUMISE, 0x0000
.2byte SPECIES_ROSELIA, 0x0002
.2byte SPECIES_GULPIN, 0x0002
.2byte SPECIES_NUMEL, 0x0002
.2byte SPECIES_TORKOAL, 0x0002
.2byte SPECIES_SPOINK, 0x0000
.2byte SPECIES_TRAPINCH, 0x0002
.2byte SPECIES_CACNEA, 0x0002
.2byte SPECIES_ANORITH, 0x0001
.2byte SPECIES_WYNAUT, 0x0000
.2byte SPECIES_SNORUNT, 0x0000
.2byte SPECIES_CLAMPERL, 0x0001
.2byte SPECIES_BAGON, 0x0001
.align 2
gUnknown_082FB5F4:: @ 82FB5F4
@ -4278,43 +4193,30 @@ gPkmnJumpStarGfx:: @ 82FBC9C
.align 2
gUnknown_082FBE08:: @ 82FBE08
.4byte gPkmnJumpRopeGfx1
.2byte 0x0600, 0x0005
obj_tiles gPkmnJumpRopeGfx1, 0x0600, 0x0005
.align 2
.4byte gPkmnJumpRopeGfx2
.2byte 0x0c00, 0x0006
obj_tiles gPkmnJumpRopeGfx2, 0x0c00, 0x0006
.align 2
.4byte gPkmnJumpRopeGfx3
.2byte 0x0600, 0x0007
obj_tiles gPkmnJumpRopeGfx3, 0x0600, 0x0007
.align 2
.4byte gPkmnJumpRopeGfx4
.2byte 0x0600, 0x0008
obj_tiles gPkmnJumpRopeGfx4, 0x0600, 0x0008
.align 2
.4byte gPkmnJumpStarGfx
.2byte 0x0200, 0x000a
obj_tiles gPkmnJumpStarGfx, 0x0200, 0x000a
.align 2
gUnknown_082FBE30:: @ 82FBE30
.4byte gPkmnJumpPal1
.2byte 0x0005
obj_pal gPkmnJumpPal1, 0x0005
.align 2
.4byte gPkmnJumpPal2
.2byte 0x0006
obj_pal gPkmnJumpPal2, 0x0006
.align 2
gUnknown_082FBE40:: @ 82FBE40
.2byte 0x0000 @ tileTag
.2byte 0x0000 @ paletteTag
.4byte gUnknown_082FBEC8
.4byte gDummySpriteAnimTable
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x0000, 0x0000, gUnknown_082FBEC8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
gUnknown_082FBE58:: @ 82FBE58
.2byte 0x0060, 0x0060, 0x0060, 0x0072, 0x0078, 0x0078, 0x0078, 0x0072
@ -4429,43 +4331,19 @@ gUnknown_082FBF60:: @ 82FBF60
.align 2
gUnknown_082FBF78:: @ 82FBF78
.2byte 0x0005 @ tileTag
.2byte 0x0005 @ paletteTag
.4byte gUnknown_082FBED0
.4byte gUnknown_082FBF48
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x0005, 0x0005, gUnknown_082FBED0, gUnknown_082FBF48, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082FBF90:: @ 82FBF90
.2byte 0x0006 @ tileTag
.2byte 0x0005 @ paletteTag
.4byte gUnknown_082FBED8
.4byte gUnknown_082FBF60
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x0006, 0x0005, gUnknown_082FBED8, gUnknown_082FBF60, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082FBFA8:: @ 82FBFA8
.2byte 0x0007 @ tileTag
.2byte 0x0005 @ paletteTag
.4byte gUnknown_082FBEE0
.4byte gUnknown_082FBF48
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x0007, 0x0005, gUnknown_082FBEE0, gUnknown_082FBF48, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082FBFC0:: @ 82FBFC0
.2byte 0x0008 @ tileTag
.2byte 0x0005 @ paletteTag
.4byte gUnknown_082FBEE0
.4byte gUnknown_082FBF48
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x0008, 0x0005, gUnknown_082FBEE0, gUnknown_082FBF48, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082FBFD8:: @ 82FBFD8
@ -4493,13 +4371,7 @@ gUnknown_082FC004:: @ 82FC004
.align 2
gUnknown_082FC00C:: @ 82FC00C
.2byte 0x000a @ tileTag
.2byte 0x0005 @ paletteTag
.4byte gUnknown_082FBFD8
.4byte gUnknown_082FC004
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x000a, 0x0005, gUnknown_082FBFD8, gUnknown_082FC004, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gPkmnJumpPal3:: @ 82FC024
@ -4549,7 +4421,7 @@ gUnknown_082FE164:: @ 82FE164 struct BgTemplate
gUnknown_082FE174:: @ 82FE174
window_template 0x00, 0x13, 0x00, 0x06, 0x02, 0x02, 0x0013
window_template 0x00, 0x08, 0x00, 0x06, 0x02, 0x02, 0x001f
window_template 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000
window_template_terminator
.align 2
gUnknown_082FE18C:: @ 82FE18C
@ -4574,13 +4446,11 @@ gUnknown_082FE1DF:: @ 82FE1DF
.align 2
gUnknown_082FE1EC:: @ 82FE1EC
.4byte gUnknown_082FF1F8
.2byte 0x0000, 0x0320
obj_tiles gUnknown_082FF1F8, 0x0000, 0x0320
.align 2
gUnknown_082FE1F4:: @ 82FE1F4
.4byte gUnknown_082FF1D8
.2byte 0x0320, 0x0000
obj_pal gUnknown_082FF1D8, 0x0320
.align 2
gUnknown_082FE1FC:: @ 82FE1FC
@ -4646,17 +4516,13 @@ gPkmnJump321StartGfx1:: @ 82FE2A4
.align 2
gUnknown_082FE6C8:: @ 82FE6C8
.4byte gPkmnJump321StartGfx1
.2byte 0x0c00, 0x2000
.4byte 0x00000000, 0x00000000
obj_tiles gPkmnJump321StartGfx1, 0x0c00, 0x2000
null_obj_tiles
.align 2
gUnknown_082FE6D8:: @ 82FE6D8
.4byte gPkmnJump321StartPal1
.2byte 0x2000, 0x0000
.4byte 0x00000000, 0x00000000
obj_pal gPkmnJump321StartPal1, 0x2000
null_obj_pal
.align 2
gUnknown_082FE6E8:: @ 82FE6E8
@ -4699,13 +4565,7 @@ gUnknown_082FE718:: @ 82FE718
.align 2
gUnknown_082FE730:: @ 82FE730
.2byte 0x2000 @ tileTag
.2byte 0x2000 @ paletteTag
.4byte gUnknown_08524914
.4byte gUnknown_082FE718
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x2000, 0x2000, gUnknown_08524914, gUnknown_082FE718, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_082FE748:: @ 82FE748
@ -4724,13 +4584,11 @@ gPkmnJump321StartGfx2:: @ 82FE778
.align 2
gUnknown_082FEBCC:: @ 82FEBCC
.4byte gPkmnJump321StartGfx2
.2byte 0x0e00
obj_tiles gPkmnJump321StartGfx2, 0x0e00, 0x0000
.align 2
gUnknown_082FEBD4:: @ 82FEBD4
.4byte gPkmnJump321StartPal2
.2byte 0x0000, 0x0000
obj_pal gPkmnJump321StartPal2, 0x0000
.align 2
gUnknown_082FEBDC:: @ 82FEBDC
@ -4818,20 +4676,8 @@ gUnknown_082FEC80:: @ 82FEC80
.4byte gUnknown_082FEC60
gUnknown_082FEC90:: @ 82FEC90
.2byte 0x0000 @ tileTag
.2byte 0x0000 @ paletteTag
.4byte gUnknown_082FEBDC
.4byte gUnknown_082FEC04
.4byte NULL
.4byte gUnknown_082FEC80
.4byte SpriteCallbackDummy
spr_template 0x0000, 0x0000, gUnknown_082FEBDC, gUnknown_082FEC04, NULL, gUnknown_082FEC80, SpriteCallbackDummy
gUnknown_082FECA8:: @ 82FECA8
.2byte 0x0000 @ tileTag
.2byte 0x0000 @ paletteTag
.4byte gUnknown_082FEBE4
.4byte gUnknown_082FEC20
.4byte NULL
.4byte gDummySpriteAffineAnimTable
.4byte SpriteCallbackDummy
spr_template 0x0000, 0x0000, gUnknown_082FEBE4, gUnknown_082FEC20, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy

9
data/multiboot_berry_glitch_fix.s
View File

@ -1,8 +1,5 @@
.section .rodata
gUnknown_089A6550:: @ 89A6550
.incbin "baserom.gba", 0x9a6550, 0xc0
gMultiBootProgram_BerryGlitchFix_Start:: @ 89A6610
.incbin "baserom.gba", 0x9a6610, 0x3b34
gMultiBootProgram_BerryGlitchFix_End::
gMultiBootProgram_BerryGlitchFix_Start:: @ 89A6550
.incbin "data/berry_fix.mb"
gMultiBootProgram_BerryGlitchFix_End:: @ 89AA144

2
data/multiboot_pokemon_colosseum.s
View File

@ -1,5 +1,5 @@
.section .rodata
gMultiBootProgram_PokemonColosseum_Start:: @ 89AA144
.incbin "baserom.gba", 0x9aa144, 0x28000
.incbin "data/pokemon_colosseum.mb"
gMultiBootProgram_PokemonColosseum_End::

BIN
data/pokemon_colosseum.mb Normal file
View File

Binary file not shown.

19
graphics/credits/credits_1.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
164 164 164
255 230 123
255 82 41
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 0 0

19
graphics/credits/credits_2.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 230 123
255 82 41
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 0 0
0 0 0
0 0 0

19
graphics/credits/credits_3.pal Normal file
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
0 0 0
0 0 0
131 65 32
16 0 0
8 139 65
8 8 0
8 8 0
8 8 0
148 131 32
16 8 0

19
graphics/credits/credits_4.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 74 65
16 65 65
131 131 32
148 131 65
8 139 65
8 139 0
8 8 32
148 131 0
148 65 65
16 74 65
0 139 65
0 131 65
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/credits/the_end_copyright.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 962 B

19
graphics/interface/berry_tag_screen.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
255 255 255
255 255 255
98 98 98
213 213 205
230 8 8
255 189 115
32 156 8
148 246 148
49 82 205
164 197 246
0 0 0
0 0 0
0 0 0
189 131 65
65 32 0
238 222 172

19
graphics/misc/cable_car.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 0 0
255 255 255
164 222 222
98 139 139
139 180 180
131 131 139
98 98 123
65 74 106
41 49 90
139 205 246
98 172 238
255 255 148
238 213 82
213 172 16
180 106 0
139 65 0

BIN
graphics/misc/cable_car.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 556 B

67
graphics/misc/cable_car_bg.pal Normal file
View File

@ -0,0 +1,67 @@
JASC-PAL
0100
64
0 0 0
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
255 230 139
238 205 123
222 189 115
205 172 106
189 156 98
180 139 90
230 106 189
230 106 189
230 106 189
0 0 0
189 255 148
156 222 98
131 197 74
106 164 49
82 115 24
57 82 0
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
230 106 189
0 0 0
213 238 255
189 230 255
164 222 255
139 213 255
115 205 255
98 205 255
197 205 222
189 189 197
180 164 164
156 131 131
131 90 90
123 65 65
230 106 189
230 106 189
230 106 189
0 0 0
197 205 246
172 189 238
156 172 238
131 156 230
115 139 230
98 123 230
65 74 106
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

BIN
graphics/misc/cable_car_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
graphics/misc/cable_car_cord.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 147 B

BIN
graphics/misc/cable_car_door.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 155 B

1
graphics/misc/cable_car_mountain_map.bin Normal file
View File

@ -0,0 +1 @@
р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!р!с!т!с!т!с!т!с!т!с!т!с!т!с!т!с!т!с!т!с!т!с!т!с!т!с!т!с!т!с!т!у!ф!у!ф!у!ф!у!ф!у!ф!у!ф!у!ф!у!ф!у!ф!у!ф!у!ф!у!ф!у!ф!у!ф!у!ф!х!ц!х!ц!х!ц!х!ц!х!ц!х!ц!х!ц!х!ц!х!ц!х!ц!х!ц!х!ц!х!ц!х!ц!х!ц!ч!ш!ч!ш!ч!ш!ч!ш!ч!ш!ч!ш!ч!ш!ч!ш!ч!ш!ч!ш!ч!ш!ч!ш!ч!ш!ч!ш!ч!ш!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!щ!a!b!c!d!e!f!g!h!i!j!k!l!m!n!o!Ў!ў!Ј!¤!Ґ!¦!§!Ё!©!Є!«!¬!­!®!Ї!q!r!s!t!u!v!w!x!y!z!{!|!}!~!!±!І!і!ґ!µ!¶!·!ё!№!є!»!ј!Ѕ!ѕ!ї!Ѓ!‚!ѓ!„!…!†!‡!€!‰!Љ!‹!Њ!Ќ!Ћ!Џ!Б!В!Г!Д!Е!Ж!З!И!Й!К!Л!М!Н!О!П!‘!’!“!”!•!–!—!<21>!™!љ!›!њ!ќ!ћ!џ!С!Т!У!Ф!Х!Ц!Ч!Ш!Щ!Ъ!Ы!Ь!Э!Ю!Я!°!А!°!А!°!А!°!А!°!А!°!А!°!А!°!А!°!А!°!А!°!А!°!А!°!А!°!А!°!А!Р!а!Р!а!Р!а!Р!а!Р!а!Р!а!Р!а!Р!а!Р!а!Р!а!Р!а!Р!а!Р!а!Р!а!Р!а!б!в!б!в!б!в!б!в!б!в!б!в!б!в!б!в!б!в!б!в!б!в!б!в!б!в!б!в!б!в!г!д!г!д!г!д!г!д!г!д!г!д!г!д!г!д!г!д!г!д!г!д!г!д!г!д!г!д!г!д!е!ж!е!ж!е!ж!е!ж!е!ж!е!ж!е!ж!е!ж!е!ж!е!ж!е!ж!е!ж!е!ж!е!ж!е!ж!з!и!з!и!з!и!з!и!з!и!з!и!з!и!з!и!з!и!з!и!з!и!з!и!з!и!з!и!з!и!й!к!й!к!й!к!й!к!й!к!й!к!й!к!й!к!й!к!й!к!й!к!й!к!й!к!й!к!й!к!л!м!л!м!л!м!л!м!л!м!л!м!л!м!л!м!л!м!л!м!л!м!л!м!л!м!л!м!л!м!

BIN
graphics/misc/cable_car_mt_chimney_map.bin Normal file
View File

Binary file not shown.

2
graphics/misc/cable_car_pylon_stem_map.bin Normal file
View File

@ -0,0 +1,2 @@
0 0 0 000000000000000000000000000000000000000000000000000000000

BIN
graphics/misc/cable_car_tree_map.bin Normal file
View File

Binary file not shown.

2
include/gba/defines.h
View File

@ -50,6 +50,8 @@
#define OAM 0x7000000
#define OAM_SIZE 0x400
#define ROM_HEADER_SIZE 0xC0
#define DISPLAY_WIDTH 240
#define DISPLAY_HEIGHT 160

7
src/berry_fix_program.c
View File

@ -129,8 +129,7 @@ static const u8 *const gUnknown_08618178[][3] = {
},
};
extern const u8 gUnknown_089A6550[0xC0];
extern const u8 gMultiBootProgram_BerryGlitchFix_Start[0x3b34];
extern const u8 gMultiBootProgram_BerryGlitchFix_Start[0x3BF4];
extern const u8 gMultiBootProgram_BerryGlitchFix_End[];
// .text
@ -174,7 +173,7 @@ static void berry_fix_main(void)
case 3:
if (berry_fix_text_update(1) == 1)
{
berry_fix_mb_manager->mb.masterp = gUnknown_089A6550;
berry_fix_mb_manager->mb.masterp = gMultiBootProgram_BerryGlitchFix_Start;
berry_fix_mb_manager->mb.server_type = 0;
MultiBootInit(&berry_fix_mb_manager->mb);
berry_fix_mb_manager->unk2 = 0;
@ -189,7 +188,7 @@ static void berry_fix_main(void)
}
else if (++ berry_fix_mb_manager->unk2 > 180)
{
MultiBootStartMaster(&berry_fix_mb_manager->mb, gMultiBootProgram_BerryGlitchFix_Start, (u32)(gMultiBootProgram_BerryGlitchFix_End - gMultiBootProgram_BerryGlitchFix_Start), 4, 1);
MultiBootStartMaster(&berry_fix_mb_manager->mb, gMultiBootProgram_BerryGlitchFix_Start + ROM_HEADER_SIZE, (u32)(gMultiBootProgram_BerryGlitchFix_End - (gMultiBootProgram_BerryGlitchFix_Start + ROM_HEADER_SIZE)), 4, 1);
berry_fix_mb_manager->state = 5;
}
break;